/[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.2 - (show annotations) (download)
Tue Nov 30 18:06:09 2010 UTC (13 years, 11 months ago) by slords
Branch: MAIN
CVS Tags: e-smith-ldap-5_2_0-76_el5_sme, e-smith-ldap-5_2_0-71_el5_sme, e-smith-ldap-5_2_0-77_el5_sme, e-smith-ldap-5_2_0-78_el5_sme, e-smith-ldap-5_2_0-70_el5_sme, e-smith-ldap-5_2_0-79_el5_sme, e-smith-ldap-5_2_0-81_el5_sme, e-smith-ldap-5_2_0-75_el5_sme, e-smith-ldap-5_2_0-73_el5_sme, e-smith-ldap-5_2_0-69_el5_sme, e-smith-ldap-5_2_0-72_el5_sme, e-smith-ldap-5_2_0-80_el5_sme, e-smith-ldap-5_2_0-74_el5_sme, HEAD
Changes since 1.1: +0 -107 lines
* Tue Nov 30 2010 Shad L. Lords <slord@mail.com> 5.2.0-69.sme
- Add rfc2739.schem back in and include in config so upgrades work [SME: 5159]

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/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
32 --- 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
33 +++ 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
34 @@ -1,4 +1,10 @@
35 {
36 + my ($dc,undef) = split (/\./, $DomainName);
37 + my $o = $ldap{defaultCompany};
38 +
39 $OUT .= "dn: $ldapBase\n";
40 $OUT .= "objectClass: organization\n";
41 + $OUT .= "dc: $dc\n";
42 + $OUT .= "o: $o\n";
43 + $OUT .= "objectClass: dcObject\n";
44 }
45 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
46 --- 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
47 +++ 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
48 @@ -6,8 +6,10 @@
49
50 $OUT .= "\n";
51 $OUT .= "dn: uid=$key,$ldapBase\n";
52 - $OUT .= "objectClass: group\n";
53 + $OUT .= "objectClass: inetOrgPerson\n";
54 $OUT .= "mail: $key\@$DomainName\n";
55 $OUT .= utf8("cn: $desc\n") if $desc;
56 + $OUT .= "uid: $key\n";
57 + $OUT .= "sn: $key\n";
58 }
59 }
60 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
61 --- 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
62 +++ 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
63 @@ -13,7 +13,7 @@
64
65 $OUT .= "\n";
66 $OUT .= utf8("dn: uid=$key,$ldapBase\n");
67 - $OUT .= utf8("objectClass: person\n");
68 + $OUT .= utf8("objectClass: inetOrgPerson\n");
69 $OUT .= utf8("uid: $key\n");
70 $OUT .= utf8("cn: $name\n") if $name;
71 $OUT .= utf8("givenName: $first\n") if $first;

admin@koozali.org
ViewVC Help
Powered by ViewVC 1.2.1 RSS 2.0 feed