Changed default ldap_version from 2 to 3. Some servers no longer allow v2.

--HG--
branch : HEAD

diff --git a/doc/dovecot-ldap-example.conf b/doc/dovecot-ldap-example.conf
index 1ca99487de8994d7bbe2c69bc5383a4a34fade52..16249f6fdc76ba9a2c9a33ee74e64c5d6dcdd59c 100644 (file)
--- a/doc/dovecot-ldap-example.conf
+++ b/doc/dovecot-ldap-example.conf
@@ -81,7 +81,7 @@
 #auth_bind_userdn =
 
 # LDAP protocol version to use. Likely 2 or 3.
-#ldap_version = 2
+#ldap_version = 3
 
 # LDAP base. %variables can be used here.
 base = uid=someone, dc=foo, dc=bar, dc=org

diff --git a/src/auth/db-ldap.c b/src/auth/db-ldap.c
index 8d5c61f42375b24b9032c6958b8d86aa44279366..cfe282e9254257c1bc33b43fdcd4e380098afb62 100644 (file)
--- a/src/auth/db-ldap.c
+++ b/src/auth/db-ldap.c
@@ -130,7 +130,7 @@ static struct ldap_settings default_ldap_settings = {
        MEMBER(deref) "never",
        MEMBER(scope) "subtree",
        MEMBER(base) NULL,
-       MEMBER(ldap_version) 2,
+       MEMBER(ldap_version) 3,
        MEMBER(debug_level) "0",
        MEMBER(ldaprc_path) "",
        MEMBER(user_attrs) "homeDirectory=home,uidNumber=uid,gidNumber=gid",