From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 5 Mar 2007 15:24:49 +0000 (+0000)
Subject: fix tpool key reset (ITS#4855)
X-Git-Tag: OPENLDAP_REL_ENG_2_3_35~42
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bd0370b20f7faf5a3a8cb0f25a6ff47b8d69469f;p=thirdparty%2Fopenldap.git

fix tpool key reset (ITS#4855)
---

diff --git a/CHANGES b/CHANGES
index 9c79a2efe2..b33c4fb28b 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.3.35 Engineering
 	Fixed slapd-bdb/hdb startup with missing shm env (ITS#4851)
 	Fixed slapd-meta/slapo-rwm filter mapping
 	Fixed slapo-refint config message (ITS#4853)
+	Fixed libldap_r tpool reset (ITS#4855)
 
 OpenLDAP 2.3.34 Release (2007/02/16)
 	Fixed libldap missing get_option(TLS CipherSuite) (ITS#4815)
diff --git a/libraries/libldap_r/tpool.c b/libraries/libldap_r/tpool.c
index e32969f6fa..d710acbcff 100644
--- a/libraries/libldap_r/tpool.c
+++ b/libraries/libldap_r/tpool.c
@@ -664,7 +664,7 @@ void ldap_pvt_thread_pool_context_reset( void *vctx )
 	int i;
 
 	for ( i=MAXKEYS-1; i>=0; i--) {
-		if ( ctx[i].ltk_key )
+		if ( ctx[i].ltk_key == NULL )
 			continue;
 		if ( ctx[i].ltk_free )
 			ctx[i].ltk_free( ctx[i].ltk_key, ctx[i].ltk_data );