From: Günther Deschner <gd@samba.org>
Date: Mon, 20 Dec 2004 18:42:58 +0000 (+0000)
Subject: r4289: Close LDAP-Connection before retrying to open a new connection in the
X-Git-Url: http://git.samba.org/samba.git/?a=commitdiff_plain;h=84e0aafc78f9d91cde3a6b1c4a57d8ed3b6fd58c;p=jra%2Fsamba%2F.git

r4289: Close LDAP-Connection before retrying to open a new connection in the
retry-loop.

This fixes a deadlock-situation when ldapsam is used with the ldapi
interface: getpeername won't fail while trying to detect dead
connections on unix domain sockets. When the ldapi-connection was closed
server-side (due to OpenLDAP's idletimeout) we *never* got a new LDAP
connection.

Guenther
(This used to be commit ac8032bacff10451fa03f155d43f0d20389512fa)
---

diff --git a/source3/lib/smbldap.c b/source3/lib/smbldap.c
index 7e485457b08..4afafde9bb6 100644
--- a/source3/lib/smbldap.c
+++ b/source3/lib/smbldap.c
@@ -977,6 +977,7 @@ static int another_ldap_try(struct smbldap_state *ldap_state, int *rc,
 
 		*attempts += 1;
 
+		smbldap_close(ldap_state);
 		open_rc = smbldap_open(ldap_state);
 
 		if (open_rc == LDAP_SUCCESS) {