summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-10-12 00:59:21 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-10-12 00:59:21 +0000
commit4920d2192206b6e0072d078cfba08f91bb03651d (patch)
treeb365c7b869e641c6ef1d0835fb17913432553521
parent24d8333c72fb7699542d8ae1625ad4862af3aa07 (diff)
downloadsamba-4920d2192206b6e0072d078cfba08f91bb03651d.tar.gz
samba-4920d2192206b6e0072d078cfba08f91bb03651d.tar.bz2
samba-4920d2192206b6e0072d078cfba08f91bb03651d.zip
We already set LDAPv3 at connect time, no need to set it again.
(This used to be commit c8e32d485bf205b6965579f94063effd86777f3f)
-rw-r--r--source3/passdb/pdb_ldap.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index a10e6f2989..38e2e0504d 100644
--- 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;