Memory context tweaks for Bind

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index 3773fc3609613d194d3e012ab9e7486c1ddb00b8..64b32f8dbe9c6e2ee84b4fac2cfb477fc07a7bb3 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -76,7 +76,7 @@ do_delete(
                goto cleanup;
        } 
 
-       rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn );
+       rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
        if( rs->sr_err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
                LDAP_LOG( OPERATION, INFO, 
@@ -151,9 +151,7 @@ do_delete(
        }
 
 #if defined( LDAP_SLAPI )
-       slapi_x_backend_set_pb( pb, op->o_bd );
-       slapi_x_connection_set_pb( pb, op->o_conn );
-       slapi_x_operation_set_pb( pb, op );
+       slapi_x_pblock_set_operation( pb, op );
        slapi_pblock_set( pb, SLAPI_DELETE_TARGET, (void *)dn.bv_val );
        slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );