1 |
dungog |
1.1 |
diff -urN smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/ldap.cfg/ldap.cfg smeserver-zarafa-0.9.0.new/root/etc/e-smith/templates/etc/zarafa/ldap.cfg/ldap.cfg |
2 |
|
|
--- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/ldap.cfg/ldap.cfg 2010-02-16 18:43:52.000000000 +1100 |
3 |
|
|
+++ smeserver-zarafa-0.9.0.new/root/etc/e-smith/templates/etc/zarafa/ldap.cfg/ldap.cfg 2010-02-16 19:15:34.000000000 +1100 |
4 |
|
|
@@ -29,18 +29,11 @@ |
5 |
|
|
# Optional, default = empty (anonymous bind) |
6 |
|
|
# The userPassword attribute must be readable for this user if the |
7 |
|
|
# ldap_authentication_method option is set to password. |
8 |
|
|
-ldap_bind_user = cn=root,{ esmith::util::ldapBase ($DomainName); } |
9 |
|
|
+ldap_bind_user = |
10 |
|
|
|
11 |
|
|
# LDAP bind password |
12 |
|
|
# Optional, default = empty (no password) |
13 |
|
|
-{ |
14 |
|
|
- open (PW, "/etc/openldap/ldap.pw") |
15 |
|
|
- || die "Could not read LDAP password.\n"; |
16 |
|
|
- my $pw = <PW>; |
17 |
|
|
- chomp ($pw); |
18 |
|
|
- close PW; |
19 |
|
|
-"ldap_bind_passwd = $pw"; |
20 |
|
|
-} |
21 |
|
|
+ldap_bind_passwd = |
22 |
|
|
|
23 |
|
|
# The timeout for network operations in seconds |
24 |
|
|
ldap_network_timeout = 30 |
25 |
|
|
@@ -122,7 +115,7 @@ |
26 |
|
|
# Choices: bind, password |
27 |
|
|
# Active directory: bind |
28 |
|
|
# LDAP: password |
29 |
|
|
-ldap_authentication_method = password |
30 |
|
|
+ldap_authentication_method = bind |
31 |
|
|
|
32 |
|
|
# Optional, default = mail |
33 |
|
|
# Active directory: mail |