Unset intop callback parameters before they go out of scope

diff --git a/servers/slapd/slapi/slapi_ops.c b/servers/slapd/slapi/slapi_ops.c
index 2f207934e7ac483a217ccea60f5089d1ca6dd0e0..73b2fbbad9d674b48dda98d3c3e3956c75e19e7d 100644 (file)
--- a/servers/slapd/slapi/slapi_ops.c
+++ b/servers/slapd/slapi/slapi_ops.c
@@ -1346,6 +1346,10 @@ int slapi_search_internal_callback_pb( Slapi_PBlock *pb,
 
 cleanup:
        slapi_pblock_set( pb, SLAPI_PLUGIN_INTOP_RESULT, (void *)rs.sr_err );
+       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 );
 
        if ( freeFilter && filter != NULL )
                slapi_filter_free( filter, 1 );

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index 5453dee727963a0d36adab74c8aa14687003c6cf..dd1bf0324177282ed3979bc8b8bdb73435e4a523 100644 (file)
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -1578,7 +1578,7 @@ slapi_send_ldap_result(
                return;
        }
 
-       if (op->o_tag == LDAP_REQ_SEARCH)
+       if ( op->o_tag == LDAP_REQ_SEARCH )
                rs.sr_nentries = nentries;
 
        send_ldap_result( op, &rs );