use slapi_pblock_delete_param()

diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index 017ac309414e19de955d130c8d873f48bb0bc1e0..c830aa5075ebfd0a4d0d6dfc56d0cb156c4fe80c 100644 (file)
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -650,10 +650,10 @@ cleanup:
                pb->pop->ors_filter = NULL;
        }
 
-       slapi_pblock_set( pb, SLAPI_X_INTOP_RESULT_CALLBACK,         NULL );
-       slapi_pblock_set( pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK,   NULL );
-       slapi_pblock_set( pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK, NULL );
-       slapi_pblock_set( pb, SLAPI_X_INTOP_CALLBACK_DATA,           NULL );
+       slapi_pblock_delete_param( pb, SLAPI_X_INTOP_RESULT_CALLBACK );
+       slapi_pblock_delete_param( pb, SLAPI_X_INTOP_SEARCH_ENTRY_CALLBACK );
+       slapi_pblock_delete_param( pb, SLAPI_X_INTOP_REFERRAL_ENTRY_CALLBACK );
+       slapi_pblock_delete_param( pb, SLAPI_X_INTOP_CALLBACK_DATA );
 
        return 0;
 }

diff --git a/servers/slapd/slapi/slapi_overlay.c b/servers/slapd/slapi/slapi_overlay.c
index 17de5516d9279538ed76c6f9c8d29e06c1c3553f..d57a2173a0e11bf7204fad56a4a085d76fd9582b 100644 (file)
--- a/servers/slapd/slapi/slapi_overlay.c
+++ b/servers/slapd/slapi/slapi_overlay.c
@@ -767,6 +767,11 @@ slapi_over_acl_group(
                else
                        rc = pb->rs.sr_err;
 
+               slapi_pblock_delete_param( pb, SLAPI_X_GROUP_ENTRY );
+               slapi_pblock_delete_param( pb, SLAPI_X_GROUP_OPERATION_DN );
+               slapi_pblock_delete_param( pb, SLAPI_X_GROUP_ATTRIBUTE );
+               slapi_pblock_delete_param( pb, SLAPI_X_GROUP_TARGET_ENTRY );
+
                if ( !internal_op )
                        slapi_pblock_destroy( pb );