1 |
slords |
1.1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-ldap-4.12.0/root/etc/e-smith/events/actions/ldap-update mezzanine_patched_e-smith-ldap-4.12.0/root/etc/e-smith/events/actions/ldap-update |
2 |
|
|
--- e-smith-ldap-4.12.0/root/etc/e-smith/events/actions/ldap-update 2006-03-15 14:17:43.000000000 -0700 |
3 |
|
|
+++ mezzanine_patched_e-smith-ldap-4.12.0/root/etc/e-smith/events/actions/ldap-update 2008-04-01 10:12:54.000000000 -0600 |
4 |
|
|
@@ -42,6 +42,10 @@ |
5 |
|
|
exit(0); |
6 |
|
|
} |
7 |
|
|
|
8 |
|
|
+my $hostname = $c->get('SystemName') |
9 |
|
|
+ || die("Couldn't determine system name"); |
10 |
|
|
+ $hostname = $hostname->value; |
11 |
|
|
+ |
12 |
|
|
my $domain = $c->get('DomainName') |
13 |
|
|
|| die("Couldn't determine domain name"); |
14 |
|
|
$domain = $domain->value; |
15 |
|
|
@@ -114,6 +118,9 @@ |
16 |
|
|
utf8::upgrade($city); |
17 |
|
|
my $street = $acct->prop('Street') || ''; |
18 |
|
|
utf8::upgrade($street); |
19 |
|
|
+ my $freebusy = $acct->prop('FreeBusy') || |
20 |
|
|
+ 'https://'.$hostname.'.'.$domain.'/horde/kronolith/fb.php?u='.$key.'@'.$domain; |
21 |
|
|
+ utf8::upgrade($freebusy); |
22 |
|
|
push @attrs, (objectClass => 'person'); |
23 |
|
|
push @attrs, (uid => $key); |
24 |
|
|
|
25 |
|
|
@@ -126,6 +133,7 @@ |
26 |
|
|
push @attrs, (ou => $dept) unless $dept =~ /^\s*$/; |
27 |
|
|
push @attrs, (l => $city) unless $city =~ /^\s*$/; |
28 |
|
|
push @attrs, (street => $street) unless $street =~ /^\s*$/; |
29 |
|
|
+ push @attrs, (calFBURL => $freebusy) unless $freebusy =~ /^\s*$/; |
30 |
|
|
} |
31 |
|
|
elsif ($type eq 'group') |
32 |
|
|
{ |
33 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-ldap-4.12.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/10schema mezzanine_patched_e-smith-ldap-4.12.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/10schema |
34 |
|
|
--- e-smith-ldap-4.12.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/10schema 2005-06-13 12:18:52.000000000 -0600 |
35 |
|
|
+++ mezzanine_patched_e-smith-ldap-4.12.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/10schema 2008-04-01 09:57:34.000000000 -0600 |
36 |
|
|
@@ -5,3 +5,4 @@ |
37 |
|
|
include /etc/openldap/schema/nis.schema |
38 |
|
|
include /etc/openldap/schema/redhat/rfc822-MailMember.schema |
39 |
|
|
include /etc/openldap/schema/redhat/autofs.schema |
40 |
|
|
+include /etc/openldap/schema/rfc2739.schema |
41 |
|
|
diff -Nur -x '*.orig' -x '*.rej' e-smith-ldap-4.12.0/root/etc/openldap/schema/rfc2739.schema mezzanine_patched_e-smith-ldap-4.12.0/root/etc/openldap/schema/rfc2739.schema |
42 |
|
|
--- e-smith-ldap-4.12.0/root/etc/openldap/schema/rfc2739.schema 1969-12-31 17:00:00.000000000 -0700 |
43 |
|
|
+++ mezzanine_patched_e-smith-ldap-4.12.0/root/etc/openldap/schema/rfc2739.schema 2006-09-14 21:13:05.000000000 -0600 |
44 |
|
|
@@ -0,0 +1,98 @@ |
45 |
|
|
+# |
46 |
|
|
+# http://www.faqs.org/rfcs/rfc2739.html |
47 |
|
|
+# |
48 |
|
|
+# From the RFC: |
49 |
|
|
+# The calCalURI contains the URI to a snapshot of the user's entire |
50 |
|
|
+# default calendar. The calFBURL contains the URI to the user's default |
51 |
|
|
+# busy time data. The calCAPURI represents contains a URI that can be |
52 |
|
|
+# used to communicate with the user's calendar. The calCalAdrURI |
53 |
|
|
+# contains a URI that points to the location to which event requests |
54 |
|
|
+# should be sent for that user. |
55 |
|
|
+# |
56 |
|
|
+# The calOtherCalURIs is a multi-valued property containing URIs to |
57 |
|
|
+# snapshots of other calendars that the user may have. The |
58 |
|
|
+# calOtherFBURLs is a multi-valued property containing URIs to other |
59 |
|
|
+# free/busy data that the user may have. The calOtherCAPURIs attribute |
60 |
|
|
+# is a multi-valued property containing URIs to other calendars that |
61 |
|
|
+# the user may have. The calOtherCalAdrURIs attribute is a multi-valued |
62 |
|
|
+# property containing URIs to other locations that a user may want |
63 |
|
|
+# event requests sent to. |
64 |
|
|
+# |
65 |
|
|
+# There is no predetermined order to the values in either multi-valued |
66 |
|
|
+# property. |
67 |
|
|
+ |
68 |
|
|
+# EQUALITY caseIgnoreIA5Match |
69 |
|
|
+ |
70 |
|
|
+attribute (1.2.840.113556.1.4.478 |
71 |
|
|
+ NAME 'calCalURI' |
72 |
|
|
+ DESC 'Snapshot of users entire default calendar' |
73 |
|
|
+ EQUALITY caseIgnoreIA5Match |
74 |
|
|
+ SUBSTR caseIgnoreIA5SubstringsMatch |
75 |
|
|
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 |
76 |
|
|
+ ) |
77 |
|
|
+ |
78 |
|
|
+attribute (1.2.840.113556.1.4.479 |
79 |
|
|
+ NAME 'calFBURL' |
80 |
|
|
+ DESC 'URI of the uses free and busy information' |
81 |
|
|
+ EQUALITY caseIgnoreIA5Match |
82 |
|
|
+ SUBSTR caseIgnoreIA5SubstringsMatch |
83 |
|
|
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 |
84 |
|
|
+ ) |
85 |
|
|
+ |
86 |
|
|
+attribute (1.2.840.113556.1.4.480 |
87 |
|
|
+ NAME 'calCAPURI' |
88 |
|
|
+ DESC 'URI used to communicate with the users calendar' |
89 |
|
|
+ EQUALITY caseIgnoreIA5Match |
90 |
|
|
+ SUBSTR caseIgnoreIA5SubstringsMatch |
91 |
|
|
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 |
92 |
|
|
+ ) |
93 |
|
|
+ |
94 |
|
|
+attribute (1.2.840.113556.1.4.481 |
95 |
|
|
+ NAME 'calCalAdrURI' |
96 |
|
|
+ DESC 'URI to which event requests should be sent for the user' |
97 |
|
|
+ EQUALITY caseIgnoreIA5Match |
98 |
|
|
+ SUBSTR caseIgnoreIA5SubstringsMatch |
99 |
|
|
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 |
100 |
|
|
+ ) |
101 |
|
|
+ |
102 |
|
|
+attribute (1.2.840.113556.1.4.482 |
103 |
|
|
+ NAME 'calOtherCalURIs' |
104 |
|
|
+ DESC 'URIs to non-default calendars belonging to the user' |
105 |
|
|
+ EQUALITY caseIgnoreIA5Match |
106 |
|
|
+ SUBSTR caseIgnoreIA5SubstringsMatch |
107 |
|
|
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 |
108 |
|
|
+ ) |
109 |
|
|
+ |
110 |
|
|
+attribute (1.2.840.113556.1.4.483 |
111 |
|
|
+ NAME 'calOtherFBURLs' |
112 |
|
|
+ DESC 'URIs to non-default free and busy information files' |
113 |
|
|
+ EQUALITY caseIgnoreIA5Match |
114 |
|
|
+ SUBSTR caseIgnoreIA5SubstringsMatch |
115 |
|
|
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 |
116 |
|
|
+ ) |
117 |
|
|
+ |
118 |
|
|
+attribute (1.2.840.113556.1.4.484 |
119 |
|
|
+ NAME 'calOtherCAPURIs' |
120 |
|
|
+ DESC 'URIs for communicating with non-default calendars' |
121 |
|
|
+ EQUALITY caseIgnoreIA5Match |
122 |
|
|
+ SUBSTR caseIgnoreIA5SubstringsMatch |
123 |
|
|
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 |
124 |
|
|
+ ) |
125 |
|
|
+ |
126 |
|
|
+attribute (1.2.840.113556.1.4.485 |
127 |
|
|
+ NAME 'calOtherCalAdrURIs' |
128 |
|
|
+ DESC 'Destinations for event requests to non-default calendars' |
129 |
|
|
+ EQUALITY caseIgnoreIA5Match |
130 |
|
|
+ SUBSTR caseIgnoreIA5SubstringsMatch |
131 |
|
|
+ SYNTAX 1.3.6.1.4.1.1466.115.121.1.26 |
132 |
|
|
+ ) |
133 |
|
|
+ |
134 |
|
|
+objectclass (1.2.840.113556.1.5.87 |
135 |
|
|
+ NAME 'calEntry' |
136 |
|
|
+ DESC 'Calendering and Free Busy information' |
137 |
|
|
+ SUP top AUXILIARY |
138 |
|
|
+ MAY (calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $ |
139 |
|
|
+ calOtherCalURIs $ calOtherFBURLs $ calOtherCAPURIs $ |
140 |
|
|
+ calOtherCalAdrURIs |
141 |
|
|
+ ) |
142 |
|
|
+ ) |