From: Hallvard Furuseth <hallvard@openldap.org>
Date: Tue, 8 Jan 2008 16:24:53 +0000 (+0000)
Subject: ITS#5309 followup: join a ldap_pvt_thread_pool_getkey() call into a setkey()
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~239
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9de53658d73cf2b4566bae8b809e3599260f4493;p=openldap

ITS#5309 followup: join a ldap_pvt_thread_pool_getkey() call into a setkey()
---

diff --git a/servers/slapd/operation.c b/servers/slapd/operation.c
index d8a4636b15..e975eae28d 100644
--- a/servers/slapd/operation.c
+++ b/servers/slapd/operation.c
@@ -117,13 +117,10 @@ slap_op_free( Operation *op, void *ctx )
 	op->o_controls = opbuf->ob_controls;
 
 	if ( ctx ) {
-		Operation *op2;
-		void *otmp = NULL;
-		ldap_pvt_thread_pool_getkey( ctx, (void *)slap_op_free, &otmp, NULL );
-		op2 = otmp;
-		LDAP_STAILQ_NEXT( op, o_next ) = op2;
+		void *op2 = NULL;
 		ldap_pvt_thread_pool_setkey( ctx, (void *)slap_op_free,
-			(void *)op, slap_op_q_destroy, NULL, NULL );
+			op, slap_op_q_destroy, &op2, NULL );
+		LDAP_STAILQ_NEXT( op, o_next ) = op2;
 	} else {
 		ber_memfree_x( op, NULL );
 	}