summaryrefslogtreecommitdiff
path: root/source3/passdb/pdb_ldap.c
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2002-10-26 02:20:59 +0000
committerAndrew Bartlett <abartlet@samba.org>2002-10-26 02:20:59 +0000
commit35ac9d287f000c27dc864789b341bebe7acb4c74 (patch)
treea05b4998fbbe9e0063bd616630458f75a022285e /source3/passdb/pdb_ldap.c
parent0e7938ab5dc666d83a490210d35fee03f6483e49 (diff)
downloadsamba-35ac9d287f000c27dc864789b341bebe7acb4c74.tar.gz
samba-35ac9d287f000c27dc864789b341bebe7acb4c74.tar.bz2
samba-35ac9d287f000c27dc864789b341bebe7acb4c74.zip
Try to catch up on the code I've put into HEAD that should be in 3.0:
- vorlan's hosts allow with DNS names patch - use x_fileno() in debug.c, not the struct directly. - check for server timeout on password change (was reporting success) - better error/status loggin in both the pam_winbind client and winbindd_pam server code. - (pdb_ldap) don't set the ldap version twice - we do it on every bind anyway. (This used to be commit 9fa1863d8e7788eda83911ca2610754486b33069)
Diffstat (limited to 'source3/passdb/pdb_ldap.c')
-rw-r--r--source3/passdb/pdb_ldap.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/source3/passdb/pdb_ldap.c b/source3/passdb/pdb_ldap.c
index a10e6f2989..2121c335a0 100644
--- a/source3/passdb/pdb_ldap.c
+++ b/source3/passdb/pdb_ldap.c
@@ -1420,13 +1420,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;