/[smeserver]/rpms/e-smith-ldap/sme8/e-smith-ldap-5.2.0-schema.patch
ViewVC logotype

Contents of /rpms/e-smith-ldap/sme8/e-smith-ldap-5.2.0-schema.patch

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph

Revision 1.1 - (show annotations) (download)
Wed Jan 13 16:01:11 2010 UTC (14 years, 5 months ago) by filippocarletti
Branch: MAIN
CVS Tags: e-smith-ldap-5_2_0-27_el5_sme, e-smith-ldap-5_2_0-19_el5_sme, e-smith-ldap-5_2_0-29_el5_sme, e-smith-ldap-5_2_0-31_el5_sme, e-smith-ldap-5_2_0-49_el5_sme, e-smith-ldap-5_2_0-39_el5_sme, e-smith-ldap-5_2_0-50_el5_sme, e-smith-ldap-5_2_0-37_el5_sme, e-smith-ldap-5_2_0-61_el5_sme, e-smith-ldap-5_2_0-66_el5_sme, e-smith-ldap-5_2_0-14_el5_sme, e-smith-ldap-5_2_0-21_el5_sme, e-smith-ldap-5_2_0-8_el5_sme, e-smith-ldap-5_2_0-18_el5_sme, e-smith-ldap-5_2_0-36_el5_sme, e-smith-ldap-5_2_0-59_el5_sme, e-smith-ldap-5_2_0-45_el5_sme, e-smith-ldap-5_2_0-7_el5_sme, e-smith-ldap-5_2_0-10_el5_sme, e-smith-ldap-5_2_0-46_el5_sme, e-smith-ldap-5_2_0-56_el5_sme, e-smith-ldap-5_2_0-55_el5_sme, e-smith-ldap-5_2_0-4_el5_sme, e-smith-ldap-5_2_0-57_el5_sme, e-smith-ldap-5_2_0-48_el5_sme, e-smith-ldap-5_2_0-44_el5_sme, e-smith-ldap-5_2_0-11_el5_sme, e-smith-ldap-5_2_0-6_el5_sme, e-smith-ldap-5_2_0-52_el5_sme, e-smith-ldap-5_2_0-51_el5_sme, e-smith-ldap-5_2_0-35_el5_sme, e-smith-ldap-5_2_0-24_el5_sme, e-smith-ldap-5_2_0-34_el5_sme, e-smith-ldap-5_2_0-28_el5_sme, e-smith-ldap-5_2_0-65_el5_sme, e-smith-ldap-5_2_0-23_el5_sme, e-smith-ldap-5_2_0-20_el5_sme, e-smith-ldap-5_2_0-54_el5_sme, e-smith-ldap-5_2_0-53_el5_sme, e-smith-ldap-5_2_0-9_el5_sme, e-smith-ldap-5_2_0-15_el5_sme, e-smith-ldap-5_2_0-17_el5_sme, e-smith-ldap-5_2_0-43_el5_sme, e-smith-ldap-5_2_0-47_el5_sme, e-smith-ldap-5_2_0-5_el5_sme, e-smith-ldap-5_2_0-25_el5_sme, e-smith-ldap-5_2_0-22_el5_sme, e-smith-ldap-5_2_0-40_el5_sme, e-smith-ldap-5_2_0-12_el5_sme, e-smith-ldap-5_2_0-41_el5_sme, e-smith-ldap-5_2_0-63_el5_sme, e-smith-ldap-5_2_0-60_el5_sme, e-smith-ldap-5_2_0-62_el5_sme, e-smith-ldap-5_2_0-42_el5_sme, e-smith-ldap-5_2_0-30_el5_sme, e-smith-ldap-5_2_0-38_el5_sme, e-smith-ldap-5_2_0-68_el5_sme, e-smith-ldap-5_2_0-67_el5_sme, e-smith-ldap-5_2_0-64_el5_sme, e-smith-ldap-5_2_0-16_el5_sme 
* Wed Jan 13 2010 Filippo Carletti <filippo.carletti@gmail.com> 5.2.0-4.sme
- Update schema for newer openldap and remove calFBurl [SME: 5159]
- Convert ldif dump [SME: 5446]
1 diff -Naur e-smith-ldap-5.2.0-old/root/etc/e-smith/events/actions/ldap-update e-smith-ldap-5.2.0/root/etc/e-smith/events/actions/ldap-update
2 --- e-smith-ldap-5.2.0-old/root/etc/e-smith/events/actions/ldap-update 2008-08-20 23:26:21.000000000 +0200
3 +++ e-smith-ldap-5.2.0/root/etc/e-smith/events/actions/ldap-update 2010-01-13 16:38:40.000000000 +0100
4 @@ -118,10 +118,7 @@
5 utf8::upgrade($city);
6 my $street = $acct->prop('Street') || '';
7 utf8::upgrade($street);
8 - my $freebusy = $acct->prop('FreeBusy') ||
9 - 'https://'.$hostname.'.'.$domain.'/horde/kronolith/fb.php?u='.$key.'@'.$domain;
10 - utf8::upgrade($freebusy);
11 - push @attrs, (objectClass => 'person');
12 + push @attrs, (objectClass => 'inetOrgPerson');
13 push @attrs, (uid => $key);
14
15 push @attrs, (cn => $name) unless ($name =~ /^\s*$/);
16 @@ -133,12 +130,12 @@
17 push @attrs, (ou => $dept) unless $dept =~ /^\s*$/;
18 push @attrs, (l => $city) unless $city =~ /^\s*$/;
19 push @attrs, (street => $street) unless $street =~ /^\s*$/;
20 - push @attrs, (calFBURL => $freebusy) unless $freebusy =~ /^\s*$/;
21 }
22 elsif ($type eq 'group')
23 {
24 - push @attrs, (objectClass => 'posixGroup');
25 + push @attrs, (objectClass => 'inetOrgPerson');
26 push @attrs, (uid => $key);
27 + push @attrs, (sn => $key);
28
29 my $key = $acct->key;
30 my $desc = $acct->prop('Description') || '';
31 diff -Naur e-smith-ldap-5.2.0-old/root/etc/e-smith/templates/etc/openldap/slapd.conf/11rfc2739schema e-smith-ldap-5.2.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/11rfc2739schema
32 --- e-smith-ldap-5.2.0-old/root/etc/e-smith/templates/etc/openldap/slapd.conf/11rfc2739schema 2008-08-20 23:26:21.000000000 +0200
33 +++ e-smith-ldap-5.2.0/root/etc/e-smith/templates/etc/openldap/slapd.conf/11rfc2739schema 1970-01-01 01:00:00.000000000 +0100
34 @@ -1 +0,0 @@
35 -include /etc/openldap/schema/rfc2739.schema
36 diff -Naur e-smith-ldap-5.2.0-old/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/10organisation e-smith-ldap-5.2.0/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/10organisation
37 --- e-smith-ldap-5.2.0-old/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/10organisation 2008-08-20 23:26:21.000000000 +0200
38 +++ e-smith-ldap-5.2.0/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/10organisation 2010-01-13 16:38:40.000000000 +0100
39 @@ -1,4 +1,10 @@
40 {
41 + my ($dc,undef) = split (/\./, $DomainName);
42 + my $o = $ldap{defaultCompany};
43 +
44 $OUT .= "dn: $ldapBase\n";
45 $OUT .= "objectClass: organization\n";
46 + $OUT .= "dc: $dc\n";
47 + $OUT .= "o: $o\n";
48 + $OUT .= "objectClass: dcObject\n";
49 }
50 diff -Naur e-smith-ldap-5.2.0-old/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/50groups e-smith-ldap-5.2.0/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/50groups
51 --- e-smith-ldap-5.2.0-old/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/50groups 2006-03-15 22:17:43.000000000 +0100
52 +++ e-smith-ldap-5.2.0/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/50groups 2010-01-13 16:38:40.000000000 +0100
53 @@ -6,8 +6,10 @@
54
55 $OUT .= "\n";
56 $OUT .= "dn: uid=$key,$ldapBase\n";
57 - $OUT .= "objectClass: group\n";
58 + $OUT .= "objectClass: inetOrgPerson\n";
59 $OUT .= "mail: $key\@$DomainName\n";
60 $OUT .= utf8("cn: $desc\n") if $desc;
61 + $OUT .= "uid: $key\n";
62 + $OUT .= "sn: $key\n";
63 }
64 }
65 diff -Naur e-smith-ldap-5.2.0-old/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/50users e-smith-ldap-5.2.0/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/50users
66 --- e-smith-ldap-5.2.0-old/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/50users 2005-04-15 21:30:38.000000000 +0200
67 +++ e-smith-ldap-5.2.0/root/etc/e-smith/templates/home/e-smith/db/ldap/ldif/50users 2010-01-13 16:38:40.000000000 +0100
68 @@ -13,7 +13,7 @@
69
70 $OUT .= "\n";
71 $OUT .= utf8("dn: uid=$key,$ldapBase\n");
72 - $OUT .= utf8("objectClass: person\n");
73 + $OUT .= utf8("objectClass: inetOrgPerson\n");
74 $OUT .= utf8("uid: $key\n");
75 $OUT .= utf8("cn: $name\n") if $name;
76 $OUT .= utf8("givenName: $first\n") if $first;
77 diff -Naur e-smith-ldap-5.2.0-old/root/etc/openldap/schema/rfc2739.schema e-smith-ldap-5.2.0/root/etc/openldap/schema/rfc2739.schema
78 --- e-smith-ldap-5.2.0-old/root/etc/openldap/schema/rfc2739.schema 2008-08-20 23:26:21.000000000 +0200
79 +++ e-smith-ldap-5.2.0/root/etc/openldap/schema/rfc2739.schema 1970-01-01 01:00:00.000000000 +0100
80 @@ -1,98 +0,0 @@
81 -#
82 -# http://www.faqs.org/rfcs/rfc2739.html
83 -#
84 -# From the RFC:
85 -# The calCalURI contains the URI to a snapshot of the user's entire
86 -# default calendar. The calFBURL contains the URI to the user's default
87 -# busy time data. The calCAPURI represents contains a URI that can be
88 -# used to communicate with the user's calendar. The calCalAdrURI
89 -# contains a URI that points to the location to which event requests
90 -# should be sent for that user.
91 -#
92 -# The calOtherCalURIs is a multi-valued property containing URIs to
93 -# snapshots of other calendars that the user may have. The
94 -# calOtherFBURLs is a multi-valued property containing URIs to other
95 -# free/busy data that the user may have. The calOtherCAPURIs attribute
96 -# is a multi-valued property containing URIs to other calendars that
97 -# the user may have. The calOtherCalAdrURIs attribute is a multi-valued
98 -# property containing URIs to other locations that a user may want
99 -# event requests sent to.
100 -#
101 -# There is no predetermined order to the values in either multi-valued
102 -# property.
103 -
104 -# EQUALITY caseIgnoreIA5Match
105 -
106 -attribute (1.2.840.113556.1.4.478
107 - NAME 'calCalURI'
108 - DESC 'Snapshot of users entire default calendar'
109 - EQUALITY caseIgnoreIA5Match
110 - SUBSTR caseIgnoreIA5SubstringsMatch
111 - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
112 - )
113 -
114 -attribute (1.2.840.113556.1.4.479
115 - NAME 'calFBURL'
116 - DESC 'URI of the uses free and busy information'
117 - EQUALITY caseIgnoreIA5Match
118 - SUBSTR caseIgnoreIA5SubstringsMatch
119 - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
120 - )
121 -
122 -attribute (1.2.840.113556.1.4.480
123 - NAME 'calCAPURI'
124 - DESC 'URI used to communicate with the users calendar'
125 - EQUALITY caseIgnoreIA5Match
126 - SUBSTR caseIgnoreIA5SubstringsMatch
127 - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
128 - )
129 -
130 -attribute (1.2.840.113556.1.4.481
131 - NAME 'calCalAdrURI'
132 - DESC 'URI to which event requests should be sent for the user'
133 - EQUALITY caseIgnoreIA5Match
134 - SUBSTR caseIgnoreIA5SubstringsMatch
135 - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
136 - )
137 -
138 -attribute (1.2.840.113556.1.4.482
139 - NAME 'calOtherCalURIs'
140 - DESC 'URIs to non-default calendars belonging to the user'
141 - EQUALITY caseIgnoreIA5Match
142 - SUBSTR caseIgnoreIA5SubstringsMatch
143 - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
144 - )
145 -
146 -attribute (1.2.840.113556.1.4.483
147 - NAME 'calOtherFBURLs'
148 - DESC 'URIs to non-default free and busy information files'
149 - EQUALITY caseIgnoreIA5Match
150 - SUBSTR caseIgnoreIA5SubstringsMatch
151 - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
152 - )
153 -
154 -attribute (1.2.840.113556.1.4.484
155 - NAME 'calOtherCAPURIs'
156 - DESC 'URIs for communicating with non-default calendars'
157 - EQUALITY caseIgnoreIA5Match
158 - SUBSTR caseIgnoreIA5SubstringsMatch
159 - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
160 - )
161 -
162 -attribute (1.2.840.113556.1.4.485
163 - NAME 'calOtherCalAdrURIs'
164 - DESC 'Destinations for event requests to non-default calendars'
165 - EQUALITY caseIgnoreIA5Match
166 - SUBSTR caseIgnoreIA5SubstringsMatch
167 - SYNTAX 1.3.6.1.4.1.1466.115.121.1.26
168 - )
169 -
170 -objectclass (1.2.840.113556.1.5.87
171 - NAME 'calEntry'
172 - DESC 'Calendering and Free Busy information'
173 - SUP top AUXILIARY
174 - MAY (calCalURI $ calFBURL $ calCAPURI $ calCalAdrURI $
175 - calOtherCalURIs $ calOtherFBURLs $ calOtherCAPURIs $
176 - calOtherCalAdrURIs
177 - )
178 - )
admin@koozali.org
 ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed