X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslapi%2Fslapi_ops.c;h=c830aa5075ebfd0a4d0d6dfc56d0cb156c4fe80c;hb=43ec05a45acf31098a461514a5ce04c176aa4994;hp=e780979b44e40787311c7393e6f36dcec2a813f4;hpb=4c513d05f713a97b7028708ceb8f1afa981bfc4f;p=openldap

diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index e780979b44..c830aa5075 100644
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -372,19 +372,21 @@ slapi_int_func_internal_pb( Slapi_PBlock *pb, slap_operation_t which )
 {
 	BI_op_bind		**func;
 	SlapReply		*rs = &pb->rs;
+	int			rc;
 
 	PBLOCK_ASSERT_INTOP( pb, 0 );
 
-	rs->sr_err = slapi_int_get_ctrls( pb );
-	if ( rs->sr_err != LDAP_SUCCESS ) {
-		return rs->sr_err;
+	rc = slapi_int_get_ctrls( pb );
+	if ( rc != LDAP_SUCCESS ) {
+		rs->sr_err = rc;
+		return rc;
 	}
 
 	func = &pb->pop->o_bd->be_bind;
 
-	rs->sr_err = func[which]( pb->pop, &pb->rs );
+	rc = func[which]( pb->pop, &pb->rs );
 
-	return rs->sr_err;
+	return rc;
 }
 
 int
@@ -648,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;
 }