X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Foverlays%2Fmemberof.c;h=09edce82b7f6f662703849bf90c0132c9c61f8a2;hb=76754855e81c68071d79e7f06978c4f394ca4228;hp=f198f71766fb6ae7902600d51dde1fdde4a36a60;hpb=2969c69747239b618dfc85b853a5b29b769ca03e;p=openldap

diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index f198f71766..09edce82b7 100644
--- a/servers/slapd/overlays/memberof.c
+++ b/servers/slapd/overlays/memberof.c
@@ -194,7 +194,7 @@ memberof_saved_member_free( void *key, void *data )
 static BerVarray
 memberof_saved_member_get( Operation *op, void *keyp )
 {
-	BerVarray	vals;
+	void		*vals;
 	BerVarray	*key = (BerVarray *)keyp;
 
 	assert( op != NULL );
@@ -204,10 +204,8 @@ memberof_saved_member_get( Operation *op, void *keyp )
 		*key = NULL;
 
 	} else {
-		ldap_pvt_thread_pool_getkey( op->o_threadctx,
-				key, (void **)&vals, NULL );
 		ldap_pvt_thread_pool_setkey( op->o_threadctx,
-				key, NULL, NULL );
+				key, NULL, 0, &vals, NULL );
 	}
 
 	return vals;
@@ -232,9 +230,9 @@ memberof_saved_member_set( Operation *op, void *keyp, BerVarray vals )
 		*key = saved_vals;
 
 	} else {
-		BerVarray	old_vals = NULL;
+		void	*old_vals = NULL;
 
-		ldap_pvt_thread_pool_setkey_x( op->o_threadctx, key,
+		ldap_pvt_thread_pool_setkey( op->o_threadctx, key,
 				saved_vals, memberof_saved_member_free, &old_vals, NULL );
 		if ( old_vals != NULL ) {
 			ber_bvarray_free( old_vals );
@@ -1515,7 +1513,7 @@ memberof_db_init(
 	ConfigReply	*cr )
 {
 	slap_overinst	*on = (slap_overinst *)be->bd_info;
-	memberof_t	tmp_mo = { 0 }, *mo;
+	memberof_t		*mo;
 
 	mo = (memberof_t *)ch_calloc( 1, sizeof( memberof_t ) );