more cleanups

diff --git a/servers/slapd/slapi/slapi_overlay.c b/servers/slapd/slapi/slapi_overlay.c
index b00a6e236a9145408a6a831f2f9f09bf0d7f3bed..97d97e39116411fc937cc029c0ffde91da6496b4 100644 (file)
--- a/servers/slapd/slapi/slapi_overlay.c
+++ b/servers/slapd/slapi/slapi_overlay.c
@@ -700,6 +700,10 @@ slapi_op_func( Operation *op, SlapReply *rs )
 
        slapi_int_pblock_set_operation( pb, op );
 
+       slapi_pblock_set( pb, SLAPI_TARGET_ADDRESS, NULL );
+       slapi_pblock_set( pb, SLAPI_TARGET_UNIQUEID, NULL );
+       slapi_pblock_set( pb, SLAPI_TARGET_DN, (void *)op->o_req_dn.bv_val );
+       
        cb.sc_response = slapi_over_response; /* call pre-entry/result plugins */
        cb.sc_cleanup = slapi_over_cleanup;  /* call post-entry/result plugins */
        cb.sc_private = opinfo;

diff --git a/servers/slapd/slapi/slapi_utils.c b/servers/slapd/slapi/slapi_utils.c
index ebf7773c840bd6a85e71c0a196470954e1a9312f..14a9aeda836294c606627c6cbab2c1376ac83a60 100644 (file)
--- a/servers/slapd/slapi/slapi_utils.c
+++ b/servers/slapd/slapi/slapi_utils.c
@@ -2616,10 +2616,6 @@ int slapi_int_pblock_set_operation( Slapi_PBlock *pb, Operation *op )
        if ( rc != LDAP_SUCCESS )
                return rc;
 
-       rc = slapi_pblock_set( pb, SLAPI_TARGET_DN, (void *)op->o_req_dn.bv_val );
-       if ( rc != LDAP_SUCCESS )
-               return rc;
-
        rc = slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)get_manageDSAit( op ) );
        if ( rc != LDAP_SUCCESS )
                return rc;