Change LDAP helpers to default to LDAP version 3 if available

World has moved on, and it's now not uncommon to find LDAP servers not
accepting the old version 2.

diff --git a/helpers/basic_auth/LDAP/basic_ldap_auth.8 b/helpers/basic_auth/LDAP/basic_ldap_auth.8
index b9e800f782f1ba017a82ed58e3fa5cf4e290c41e..9df8ce356aa4f26d4ef34fc42021f3fdfa2d7fce 100644 (file)
--- a/helpers/basic_auth/LDAP/basic_ldap_auth.8
+++ b/helpers/basic_auth/LDAP/basic_ldap_auth.8
@@ -212,7 +212,7 @@ server specificiation by using servername:port syntax.
 .
 .if !'po4a'hide' .TP
 .if !'po4a'hide' .B "\-v 2|3"
-LDAP protocol version. Defaults to 2 if not specified.
+LDAP protocol version. Defaults to 3 if not specified.
 .
 .if !'po4a'hide' .TP
 .if !'po4a'hide' .BI \-Z

diff --git a/helpers/basic_auth/LDAP/basic_ldap_auth.cc b/helpers/basic_auth/LDAP/basic_ldap_auth.cc
index c150d2fe02f2749fecd4e7784887b081849502fa..1e78bc324ebb2d1f5028e4f506f9bd7958caaa6b 100644 (file)
--- a/helpers/basic_auth/LDAP/basic_ldap_auth.cc
+++ b/helpers/basic_auth/LDAP/basic_ldap_auth.cc
@@ -288,7 +288,7 @@ open_ldap_connection(const char *ldapServer, int port)
 
 #ifdef LDAP_VERSION3
     if (version == -1) {
-        version = LDAP_VERSION2;
+        version = LDAP_VERSION3;
     }
     if (ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_SUCCESS) {
         fprintf(stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n",

diff --git a/helpers/external_acl/ldap_group/squid_ldap_group.8 b/helpers/external_acl/ldap_group/squid_ldap_group.8
index f94d81a2ec64a895a828b14624ace8269969fbbd..bd5d7d06e32c5e004f282815a30bf12487453d60 100644 (file)
--- a/helpers/external_acl/ldap_group/squid_ldap_group.8
+++ b/helpers/external_acl/ldap_group/squid_ldap_group.8
@@ -200,7 +200,7 @@ are supported.
 .
 .if !'po4a'hide' .TP
 .if !'po4a'hide' .BI \-v " 2|3"
-LDAP protocol version. Defaults to 2 if not specified.
+LDAP protocol version. Defaults to 3 if not specified.
 .
 .if !'po4a'hide' .TP
 .if !'po4a'hide' .BI \-Z

diff --git a/helpers/external_acl/ldap_group/squid_ldap_group.c b/helpers/external_acl/ldap_group/squid_ldap_group.c
index 533699702462a9a05ec66fc007e4ae78e0b8b18b..d4dbf6df15ccf569858e658a82e0144ac01b8678 100644 (file)
--- a/helpers/external_acl/ldap_group/squid_ldap_group.c
+++ b/helpers/external_acl/ldap_group/squid_ldap_group.c
@@ -535,7 +535,7 @@ recover:
 
 #ifdef LDAP_VERSION3
                 if (version == -1) {
-                    version = LDAP_VERSION2;
+                    version = LDAP_VERSION3;
                 }
                 if (ldap_set_option(ld, LDAP_OPT_PROTOCOL_VERSION, &version) != LDAP_SUCCESS) {
                     fprintf(stderr, "Could not set LDAP_OPT_PROTOCOL_VERSION %d\n",