From: Pierangelo Masarati <ando@openldap.org>
Date: Wed, 26 Sep 2007 21:04:22 +0000 (+0000)
Subject: temporary fix to ITS#5154
X-Git-Tag: OPENLDAP_REL_ENG_2_3_39~25
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=25b997c64aa4bae926f824064863b245904aae96;p=openldap

temporary fix to ITS#5154
---

diff --git a/CHANGES b/CHANGES
index 376174688f..1410e2a64c 100644
--- a/CHANGES
+++ b/CHANGES
@@ -7,7 +7,8 @@ OpenLDAP 2.3.39 Engineering
 	Fixed slapd ACL sets memory handling (ITS#4873)
 	Fixed slapd ordered values add normalization issue (ITS#5136)
 	Fixed slapd-bdb DB_CONFIG conversion bug (ITS#5118)
-	Fixed slapd-ldap SASL idassert w/o autchId
+	Fixed slapd-ldap SASL idassert w/o authcId
+	Fixed slapd-meta conn caching on bind failure (ITS#5154)
 	Fixed slapd-sql concurrency issue (ITS#5095)
 	Fixed slapo-chain double-free (ITS#5137)
 	Fixed slapo-pcache and -rwm interaction fix (ITS#4991) 
diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 717462ffab..495481bf29 100644
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -189,6 +189,10 @@ meta_back_bind( Operation *op, SlapReply *rs )
 
 		if ( lerr != LDAP_SUCCESS ) {
 			rc = rs->sr_err = lerr;
+			/* Mark the meta_conn struct as tainted so
+			 * it'll be freed by meta_conn_back_destroy below */
+			LDAP_BACK_CONN_TAINTED_SET( mc );
+
 			/* FIXME: in some cases (e.g. unavailable)
 			 * do not assume it's not candidate; rather
 			 * mark this as an error to be eventually