From: Luke Howard <lukeh@openldap.org>
Date: Fri, 22 Jul 2005 06:46:07 +0000 (+0000)
Subject: more cleanups
X-Git-Tag: OPENLDAP_AC_BP~257
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=0799e6a2467fa83039185db3daab9417b458ffd2;p=openldap

more cleanups
---

diff --git a/servers/slapd/slapi/slapi_overlay.c b/servers/slapd/slapi/slapi_overlay.c
index b00a6e236a..97d97e3911 100644
--- 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 ebf7773c84..14a9aeda83 100644
--- 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;