Fix ITS#3424

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 3efcfcc6081fe5c20413b841b3b7f6c3d8f2398c..ee08166ea506cf027ab69f899924353ff6965b5c 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -229,17 +229,17 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
         * 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, 0 );
+       op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 1 );
        if ( op->o_bd == NULL ) {
-               rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
+               rs->sr_ref = referral_rewrite( default_referral,
                        NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
-               if (!rs->sr_ref) rs->sr_ref = SLAPD_GLOBAL(default_referral);
+               if (!rs->sr_ref) rs->sr_ref = default_referral;
 
                if ( rs->sr_ref != NULL ) {
                        rs->sr_err = LDAP_REFERRAL;
                        send_ldap_result( op, rs );
 
-                       if (rs->sr_ref != SLAPD_GLOBAL(default_referral)) ber_bvarray_free( rs->sr_ref );
+                       if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref );
                } else {
                        send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
                                "no global superior knowledge" );
@@ -338,7 +338,7 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
                                org_managedsait = get_manageDSAit( op );
                                op->o_dn = op->o_bd->be_rootdn;
                                op->o_ndn = op->o_bd->be_rootndn;
-                               op->o_managedsait = 1;
+                               op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
 
                                while ( rs->sr_err == LDAP_SUCCESS &&
                                                op->o_delete_glue_parent ) {
@@ -366,7 +366,7 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
 #ifndef SLAPD_MULTIMASTER
                } else {
                        BerVarray defref = op->o_bd->be_update_refs
-                               ? op->o_bd->be_update_refs : SLAPD_GLOBAL(default_referral);
+                               ? op->o_bd->be_update_refs : default_referral;
 
                        if ( defref != NULL ) {
                                rs->sr_ref = referral_rewrite( defref,