1 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00begin mezzanine_patched_e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00begin |
2 |
--- e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00begin 1969-12-31 18:00:00.000000000 -0600 |
3 |
+++ mezzanine_patched_e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/00begin 2010-11-12 13:06:30.000000000 -0600 |
4 |
@@ -0,0 +1,7 @@ |
5 |
+//00begin |
6 |
+{ |
7 |
+ |
8 |
+ use esmith::util; |
9 |
+ $basedn = esmith::util::ldapBase ($DomainName); |
10 |
+ |
11 |
+} |
12 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP mezzanine_patched_e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP |
13 |
--- e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP 2010-11-12 13:08:38.000000000 -0600 |
14 |
+++ mezzanine_patched_e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/50LocalLDAP 2010-11-12 13:06:56.000000000 -0600 |
15 |
@@ -17,9 +17,7 @@ |
16 |
'port' => 389, |
17 |
'tls' => false, |
18 |
{ |
19 |
- my $domainName = $DomainName; |
20 |
- $domainName =~ s/\./,dc=/g; |
21 |
- $OUT = qq( 'root' => 'dc=$domainName',); |
22 |
+ $OUT .= qq( 'root' => '$basedn',); |
23 |
} |
24 |
// 'bind_dn' => 'cn=admin,ou=users,dc=example,dc=com', |
25 |
// // For Active Directory: |
26 |
diff -Nur -x '*.orig' -x '*.rej' e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/60LocalLDAPGroups mezzanine_patched_e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/60LocalLDAPGroups |
27 |
--- e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/60LocalLDAPGroups 2010-11-12 13:08:38.000000000 -0600 |
28 |
+++ mezzanine_patched_e-smith-turba-3.2.0/root/etc/e-smith/templates/home/httpd/html/horde/turba/config/sources.php/60LocalLDAPGroups 2010-11-12 13:07:03.000000000 -0600 |
29 |
@@ -17,9 +17,7 @@ |
30 |
'port' => 389, |
31 |
'tls' => false, |
32 |
{ |
33 |
- my $domainName = $DomainName; |
34 |
- $domainName =~ s/\./,dc=/g; |
35 |
- $OUT = qq( 'root' => 'dc=$domainName',); |
36 |
+ $OUT .= qq( 'root' => '$basedn',); |
37 |
} |
38 |
'sizelimit' => 200, |
39 |
'dn' => array('cn'), |