Fallout from ITS#4986 - remove unused param of select_backend()

[openldap] / servers / slapd / delete.c

diff --git a/servers/slapd/delete.c b/servers/slapd/delete.c
index e31c51bbdb79b7b263f7cd044a0207a34080c171..2f9c1a0b0e94fd7042c4f72de08199ec9be479c3 100644 (file)
--- a/servers/slapd/delete.c
+++ b/servers/slapd/delete.c
@@ -107,17 +107,14 @@ int
 fe_op_delete( Operation *op, SlapReply *rs )
 {
        struct berval   pdn = BER_BVNULL;
-       int             manageDSAit;
        BackendDB       *op_be, *bd = op->o_bd;
        
-       manageDSAit = get_manageDSAit( op );
-
        /*
         * We could be serving multiple database backends.  Select the
         * appropriate one, or send a referral to our "referral server"
         * if we don't hold it.
         */
-       op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 1 );
+       op->o_bd = select_backend( &op->o_req_ndn, 1 );
        if ( op->o_bd == NULL ) {
                op->o_bd = bd;
                rs->sr_ref = referral_rewrite( default_referral,
@@ -139,7 +136,7 @@ fe_op_delete( Operation *op, SlapReply *rs )
        /* If we've got a glued backend, check the real backend */
        op_be = op->o_bd;
        if ( SLAP_GLUE_INSTANCE( op->o_bd )) {
-               op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 );
+               op->o_bd = select_backend( &op->o_req_ndn, 0 );
        }
 
        /* check restrictions */
@@ -168,15 +165,8 @@ fe_op_delete( Operation *op, SlapReply *rs )
                        struct berval   org_dn = BER_BVNULL;
                        struct berval   org_ndn = BER_BVNULL;
                        int             org_managedsait;
-                       slap_callback   cb = { NULL, slap_replog_cb, NULL, NULL };
 
                        op->o_bd = op_be;
-
-                       if ( !op->o_bd->be_update_ndn.bv_len || !repl_user ) {
-                               cb.sc_next = op->o_callback;
-                               op->o_callback = &cb;
-                       }
-
                        op->o_bd->be_delete( op, rs );
 
                        org_req_dn = op->o_req_dn;