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 --- smeserver-zarafa-0.9.0/root/etc/e-smith/templates/etc/zarafa/ldap.cfg/ldap.cfg 2010-02-16 18:43:52.000000000 +1100 +++ 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 @@ -29,18 +29,11 @@ # Optional, default = empty (anonymous bind) # The userPassword attribute must be readable for this user if the # ldap_authentication_method option is set to password. -ldap_bind_user = cn=root,{ esmith::util::ldapBase ($DomainName); } +ldap_bind_user = # LDAP bind password # Optional, default = empty (no password) -{ - open (PW, "/etc/openldap/ldap.pw") - || die "Could not read LDAP password.\n"; - my $pw = ; - chomp ($pw); - close PW; -"ldap_bind_passwd = $pw"; -} +ldap_bind_passwd = # The timeout for network operations in seconds ldap_network_timeout = 30 @@ -122,7 +115,7 @@ # Choices: bind, password # Active directory: bind # LDAP: password -ldap_authentication_method = password +ldap_authentication_method = bind # Optional, default = mail # Active directory: mail