ITS#3576 use actual backend (not glue instance) for restriction and

[openldap] / servers / slapd / back-sql / modrdn.c

diff --git a/servers/slapd/back-sql/modrdn.c b/servers/slapd/back-sql/modrdn.c
index d9b2d4d922184cf719f118ad9c1a559e194b2da0..a1578e565d8749d6c399feea9a62c11211a6f858 100644 (file)
--- a/servers/slapd/back-sql/modrdn.c
+++ b/servers/slapd/back-sql/modrdn.c
@@ -83,9 +83,8 @@ backsql_modrdn( Operation *op, SlapReply *rs )
                break;
 
        case LDAP_REFERRAL:
-               if ( !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
-                               dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname )
-                               && manageDSAit )
+               if ( manageDSAit && !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
+                               dn_match( &op->o_req_ndn, &bsi.bsi_e->e_nname ) )
                {
                        rs->sr_err = LDAP_SUCCESS;
                        rs->sr_text = NULL;
@@ -464,9 +463,8 @@ backsql_modrdn( Operation *op, SlapReply *rs )
                        break;
 
                case LDAP_REFERRAL:
-                       if ( !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
-                                       dn_match( &new_ndn, &bsi.bsi_e->e_nname )
-                                       && manageDSAit )
+                       if ( manageDSAit && !BER_BVISNULL( &bsi.bsi_e->e_nname ) &&
+                                       dn_match( &new_ndn, &bsi.bsi_e->e_nname ) )
                        {
                                rs->sr_err = LDAP_SUCCESS;
                                rs->sr_text = NULL;