From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 8 Jun 2006 23:41:02 +0000 (+0000)
Subject: cleanup resource release
X-Git-Tag: OPENLDAP_REL_ENG_2_4_3ALPHA~9^2~170
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=942ca176694396f548b585b54c5c305ff549d246;p=openldap

cleanup resource release
---

diff --git a/servers/slapd/back-ldap/bind.c b/servers/slapd/back-ldap/bind.c
index b3433d322a..fd51c670a0 100644
--- a/servers/slapd/back-ldap/bind.c
+++ b/servers/slapd/back-ldap/bind.c
@@ -182,7 +182,7 @@ retry_lock:;
 					"=>ldap_back_bind: destroying conn %ld (refcnt=%u)\n",
 					LDAP_BACK_PCONN_ID( lc->lc_conn ), lc->lc_refcnt, 0 );
 
-				if ( lc->lc_refcnt != 0 ) {
+				if ( tmplc->lc_refcnt != 0 ) {
 					/* taint it */
 					LDAP_BACK_CONN_TAINTED_SET( tmplc );
 
@@ -1432,6 +1432,7 @@ ldap_back_retry( ldapconn_t **lcp, Operation *op, SlapReply *rs, ldap_back_send_
 			"ldap_back_retry: conn %p refcnt=%u unable to retry.\n",
 			(void *)(*lcp), (*lcp)->lc_refcnt, 0 );
 
+		LDAP_BACK_CONN_TAINTED_SET( *lcp );
 		ldap_back_release_conn_lock( op, rs, *lcp, 0 );
 		*lcp = NULL;
 
diff --git a/servers/slapd/back-meta/bind.c b/servers/slapd/back-meta/bind.c
index 0e2d4b1ac0..af9b13a8ca 100644
--- a/servers/slapd/back-meta/bind.c
+++ b/servers/slapd/back-meta/bind.c
@@ -217,7 +217,7 @@ retry_lock:;
 						"=>meta_back_bind: destroying conn %ld (refcnt=%u)\n",
 						LDAP_BACK_PCONN_ID( mc->mc_conn ), mc->mc_refcnt, 0 );
 
-					if ( mc->mc_refcnt != 0 ) {
+					if ( tmpmc->mc_refcnt != 0 ) {
 						/* taint it */
 						LDAP_BACK_CONN_TAINTED_SET( tmpmc );