We already set LDAPv3 at connect time, no need to set it again.

(This used to be commit c8e32d485bf205b6965579f94063effd86777f3f)

diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index a10e6f2989b43c7baaeb6895f626084b02771d33..38e2e0504d1c09435fd55fa1a5925c256321199c 100644 (file)
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1374,7 +1374,6 @@ static NTSTATUS ldapsam_getsampwsid(struct pdb_methods *my_methods, SAM_ACCOUNT
 static NTSTATUS ldapsam_modify_entry(LDAP *ldap_struct,SAM_ACCOUNT *newpwd,char *dn,LDAPMod **mods,int ldap_op)
 {
        NTSTATUS ret = NT_STATUS_UNSUCCESSFUL;
-       int version;
        int rc;
        
        switch(ldap_op)
@@ -1420,13 +1419,6 @@ static NTSTATUS ldapsam_modify_entry(LDAP *ldap_struct,SAM_ACCOUNT *newpwd,char
                char *retoid;
                struct berval *retdata;
 
-               if (ldap_get_option(ldap_struct, LDAP_OPT_PROTOCOL_VERSION, &version) == LDAP_OPT_SUCCESS) {
-                       if (version != LDAP_VERSION3) {
-                               version = LDAP_VERSION3;
-                               ldap_set_option (ldap_struct, LDAP_OPT_PROTOCOL_VERSION, &version);
-                       }
-               }
-
                if ((ber = ber_alloc_t(LBER_USE_DER))==NULL) {
                        DEBUG(0,("ber_alloc_t returns NULL\n"));
                        return ret;