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

diff --git a/servers/slapd/overlays/memberof.c b/servers/slapd/overlays/memberof.c
index 3a5c6ac4c0..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,8 +230,13 @@ memberof_saved_member_set( Operation *op, void *keyp, BerVarray vals )
 		*key = saved_vals;
 
 	} else {
+		void	*old_vals = NULL;
+
 		ldap_pvt_thread_pool_setkey( op->o_threadctx, key,
-				saved_vals, memberof_saved_member_free );
+				saved_vals, memberof_saved_member_free, &old_vals, NULL );
+		if ( old_vals != NULL ) {
+			ber_bvarray_free( old_vals );
+		}
 	}
 }
 
@@ -467,8 +470,10 @@ memberof_value_modify(
 			char buf[ SLAP_TEXT_BUFLEN ];
 			snprintf( buf, sizeof( buf ),
 				"memberof_value_modify %s=\"%s\" failed err=%d text=%s",
-				ad->ad_cname.bv_val, new_dn->bv_val, rs2.sr_err, rs2.sr_text );
-			Debug( LDAP_DEBUG_ANY, "%s: %s\n", op->o_log_prefix, buf, 0 );
+				ad->ad_cname.bv_val, new_dn->bv_val, rs2.sr_err,
+				rs2.sr_text ? rs2.sr_text : "" );
+			Debug( LDAP_DEBUG_ANY, "%s: %s\n",
+				op->o_log_prefix, buf, 0 );
 		}
 
 		assert( op2.orm_modlist == &mod[ mcnt ] );
@@ -481,6 +486,8 @@ memberof_value_modify(
 		if ( ml != NULL ) {
 			slap_mods_free( ml, 1 );
 		}
+
+		mod[ 0 ].sml_next = NULL;
 	}
 
 	if ( old_ndn != NULL ) {
@@ -498,8 +505,10 @@ memberof_value_modify(
 			char buf[ SLAP_TEXT_BUFLEN ];
 			snprintf( buf, sizeof( buf ),
 				"memberof_value_modify %s=\"%s\" failed err=%d text=%s",
-				ad->ad_cname.bv_val, old_dn->bv_val, rs2.sr_err, rs2.sr_text );
-			Debug( LDAP_DEBUG_ANY, "%s: %s\n", op->o_log_prefix, buf, 0 );
+				ad->ad_cname.bv_val, old_dn->bv_val, rs2.sr_err,
+				rs2.sr_text ? rs2.sr_text : "" );
+			Debug( LDAP_DEBUG_ANY, "%s: %s\n",
+				op->o_log_prefix, buf, 0 );
 		}
 
 		assert( op2.orm_modlist == &mod[ mcnt ] );
@@ -1218,6 +1227,7 @@ memberof_res_delete( Operation *op, SlapReply *rs )
 					NULL, NULL );
 		}
 
+		memberof_saved_member_set( op, &saved_memberof_vals, NULL );
  		ber_bvarray_free( vals );
 	}
 
@@ -1231,6 +1241,7 @@ memberof_res_delete( Operation *op, SlapReply *rs )
 						NULL, NULL );
 			}
 
+			memberof_saved_member_set( op, &saved_member_vals, NULL );
 	 		ber_bvarray_free( vals );
 		}
 	}
@@ -1502,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 ) );