From 43ec05a45acf31098a461514a5ce04c176aa4994 Mon Sep 17 00:00:00 2001 From: Luke Howard Date: Mon, 25 Jul 2005 05:03:09 +0000 Subject: [PATCH] use slapi_pblock_delete_param() --- servers/slapd/slapi/slapi_ops.c | 8 ++++---- servers/slapd/slapi/slapi_overlay.c | 5 +++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c index 017ac30941..c830aa5075 100644 --- 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 17de5516d9..d57a2173a0 100644 --- 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 ); -- 2.39.5