From 31722222660cf13e927d232a69394629281c98f4 Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 18 Jun 2005 18:59:04 +0000
Subject: [PATCH] cleanup of previous commit

---
 servers/slapd/overlays/rwm.c | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/servers/slapd/overlays/rwm.c b/servers/slapd/overlays/rwm.c
index 28b9135287..c1babcfb20 100644
--- a/servers/slapd/overlays/rwm.c
+++ b/servers/slapd/overlays/rwm.c
@@ -583,7 +583,7 @@ rwm_op_modrdn( Operation *op, SlapReply *rs )
 	return SLAP_CB_CONTINUE;
 }
 
-static slap_callback	*rwm_cb;
+static slap_callback	rwm_cb;
 
 static void
 rwm_keyfree(
@@ -598,22 +598,16 @@ rwm_callback_get( Operation *op )
 {
 	void		*data = NULL;
 
-	if ( op->o_threadctx ) {
-		ldap_pvt_thread_pool_getkey( op->o_threadctx,
-				rwm_keyfree, &data, NULL );
-	} else {
-		data = rwm_cb;
+	if ( op->o_threadctx == NULL ) {
+		return &rwm_cb;
 	}
 
+	ldap_pvt_thread_pool_getkey( op->o_threadctx,
+			rwm_keyfree, &data, NULL );
 	if ( data == NULL ) {
-		data = ber_memalloc( sizeof( slap_callback ) );
-		if ( op->o_threadctx ) {
-			ldap_pvt_thread_pool_setkey( op->o_threadctx,
-					rwm_keyfree, data, rwm_keyfree );
-
-		} else {
-			rwm_cb = (slap_callback *)data;
-		}
+		data = ch_calloc( sizeof( slap_callback ), 1 );
+		ldap_pvt_thread_pool_setkey( op->o_threadctx,
+				rwm_keyfree, data, rwm_keyfree );
 	}
 
 	return (slap_callback *)data;