From: Timo Sirainen <tss@iki.fi>
Date: Mon, 2 Feb 2009 23:25:21 +0000 (-0500)
Subject: Changed default ldap_version from 2 to 3. Some servers no longer allow v2.
X-Git-Tag: 1.2.beta1~39
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=77cf38711809ab951741fcd306db2665cd78c8f2;p=thirdparty%2Fdovecot%2Fcore.git

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 1ca99487de..16249f6fdc 100644
--- 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 8d5c61f423..cfe282e925 100644
--- 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",