fix tpool key reset (ITS#4855)

diff --git a/CHANGES b/CHANGES
index 9c79a2efe2a6095c475208dab237cae5cfa40c6c..b33c4fb28b5e4124bc486e2d4188e0061c382614 100644 (file)
--- 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 e32969f6fa470d78ce9c29bba183b57506d6d24f..d710acbcff9c8168bf8e015e89934ab1a7f8984e 100644 (file)
--- 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 );