sync for rc2 :-( (forgot the LDAP fix)

diff --git a/WHATSNEW.txt b/WHATSNEW.txt
index 80e5a979c22bf3e96498f324bd16a5288f435405..788c613f658f4e7d1e502e21ac42710f505ca27b 100644 (file)
--- a/WHATSNEW.txt
+++ b/WHATSNEW.txt
@@ -66,6 +66,7 @@ Changes since 2.2.6pre2
 36) Add version strings to the usage message for smbcacls and smbpasswd
 37) Fix bug in the write cache code
 38) make the default printed values for boolean the same for all parameters
+39) Default all LDAP connections to v3 with compiling with --with-ldapsam
 
 
 Changes since 2.2.6pre1

diff --git a/source/libsmb/smberr.c b/source/libsmb/smberr.c
index fbe1d779472892e80a69ff1f7ef8d4b5974f1917..3085211115bf0da16daf104d59585f6729ef213b 100644 (file)
--- a/source/libsmb/smberr.c
+++ b/source/libsmb/smberr.c
@@ -78,6 +78,7 @@ err_code_struct dos_msgs[] = {
   {"ERRlogonfailure",ERRlogonfailure,"Logon failure"},
   {"ERRdiskfull",ERRdiskfull,"Disk full"},
   {"ERRgeneral",ERRgeneral, "General failure"},
+  {"ERRunknownlevel",ERRunknownlevel, "Unknown info level"},
   {NULL,-1,NULL}};
 
 /* Server Error Messages */

diff --git a/source/passdb/pdb_ldap.c b/source/passdb/pdb_ldap.c
index a42583471789b1e060056c0e0d6971a84050ff72..5795aa7b9bd5c8af4f515dd485403eb68a589fc1 100644 (file)
--- a/source/passdb/pdb_ldap.c
+++ b/source/passdb/pdb_ldap.c
@@ -155,9 +155,9 @@ static BOOL ldap_open_connection (LDAP ** ldap_struct)
        /* Connect to older servers using SSL and V2 rather than Start TLS */
        if (ldap_get_option(*ldap_struct, LDAP_OPT_PROTOCOL_VERSION, &version) == LDAP_OPT_SUCCESS)
        {
-               if (version != LDAP_VERSION2)
+               if (version != LDAP_VERSION3)
                {
-                       version = LDAP_VERSION2;
+                       version = LDAP_VERSION3;
                        ldap_set_option (*ldap_struct, LDAP_OPT_PROTOCOL_VERSION, &version);
                }
        }