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

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 4a5cf8f9f628a7dc931e2215c74670dd52bb0745..067dd4c5271588883fbc9e745f9d2718d7fbcb7d 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -184,6 +184,12 @@ do_modrdn(
        op->o_bd = frontendDB;
        rs->sr_err = frontendDB->be_modrdn( op, rs );
 
+#ifdef LDAP_X_TXN
+       if( rs->sr_err == LDAP_X_TXN_SPECIFY_OKAY ) {
+               /* skip cleanup */
+       }
+#endif
+
 cleanup:
        op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
        op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
@@ -194,10 +200,12 @@ cleanup:
        if ( op->orr_modlist != NULL )
                slap_mods_free( op->orr_modlist, 1 );
 
-       if ( !BER_BVISNULL( &pnewSuperior ) ) 
+       if ( !BER_BVISNULL( &pnewSuperior ) ) {
                op->o_tmpfree( pnewSuperior.bv_val, op->o_tmpmemctx );
-       if ( !BER_BVISNULL( &nnewSuperior ) )
+       }
+       if ( !BER_BVISNULL( &nnewSuperior ) ) {
                op->o_tmpfree( nnewSuperior.bv_val, op->o_tmpmemctx );
+       }
 
        return rs->sr_err;
 }
@@ -206,7 +214,6 @@ int
 fe_op_modrdn( Operation *op, SlapReply *rs )
 {
        Backend         *newSuperior_be = NULL;
-       int             manageDSAit;
        struct berval   pdn = BER_BVNULL;
        BackendDB       *op_be, *bd = op->o_bd;
        
@@ -229,14 +236,12 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
        Statslog( LDAP_DEBUG_STATS, "%s MODRDN dn=\"%s\"\n",
            op->o_log_prefix, op->o_req_dn.bv_val, 0, 0, 0 );
 
-       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,
@@ -258,7 +263,7 @@ fe_op_modrdn( 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 */
@@ -276,7 +281,7 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
         * the same backend, otherwise we return an error.
         */
        if( op->orr_newSup ) {
-               newSuperior_be = select_backend( op->orr_nnewSup, 0, 0 );
+               newSuperior_be = select_backend( op->orr_nnewSup, 0 );
 
                if ( newSuperior_be != op->o_bd ) {
                        /* newSuperior is in different backend */
@@ -296,21 +301,9 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
        if ( op->o_bd->be_modrdn ) {
                /* do the update here */
                int repl_user = be_isupdate( op );
-#ifndef SLAPD_MULTIMASTER
-               if ( !SLAP_SHADOW(op->o_bd) || repl_user )
-#endif /* ! SLAPD_MULTIMASTER */
+               if ( !SLAP_SINGLE_SHADOW(op->o_bd) || repl_user )
                {
-                       slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
-
                        op->o_bd = op_be;
-
-#ifdef SLAPD_MULTIMASTER
-                       if ( !op->o_bd->be_update_ndn.bv_len || !repl_user )
-#endif /* SLAPD_MULTIMASTER */
-                       {
-                               cb.sc_next = op->o_callback;
-                               op->o_callback = &cb;
-                       }
                        op->o_bd->be_modrdn( op, rs );
 
                        if ( op->o_bd->be_delete ) {
@@ -345,14 +338,13 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
                                        }
                                }
                                op->o_managedsait = org_managedsait;
-                               op->o_dn = org_dn;
+                               op->o_dn = org_dn;
                                op->o_ndn = org_ndn;
                                op->o_req_dn = org_req_dn;
                                op->o_req_ndn = org_req_ndn;
                                op->o_delete_glue_parent = 0;
                        }
 
-#ifndef SLAPD_MULTIMASTER
                } else {
                        BerVarray defref = op->o_bd->be_update_refs
                                ? op->o_bd->be_update_refs : default_referral;
@@ -370,7 +362,6 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
                                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
                                        "shadow context; no update referral" );
                        }
-#endif /* ! SLAPD_MULTIMASTER */
                }
        } else {
                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
@@ -415,6 +406,7 @@ slap_modrdn2mods(
                        goto done;
                }
        }
+       rs->sr_text = NULL;
 
        /* Add new attribute values to the entry */
        for ( a_cnt = 0; new_rdn[a_cnt]; a_cnt++ ) {