fix ITS#4686 (retry with idassert)

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

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index e2b3b405e8de51cfe8fb63a5b19ceefc6c2200bb..f158e32368559b1e4b08b99def48f05196589ec9 100644 (file)
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -73,6 +73,7 @@ ldap_back_modrdn(
                newSup = op->orr_newSup->bv_val;
        }
 
+retry:
        ctrls = op->o_ctrls;
        rc = ldap_back_proxy_authz_ctrl( &lc->lc_bound_ndn,
                li->li_version, &li->li_idassert, op, rs, &ctrls );
@@ -82,7 +83,6 @@ ldap_back_modrdn(
                goto cleanup;
        }
 
-retry:
        rs->sr_err = ldap_rename( lc->lc_ld, op->o_req_dn.bv_val,
                        op->orr_newrdn.bv_val, newSup,
                        op->orr_deleteoldrdn, ctrls, NULL, &msgid );
@@ -92,6 +92,8 @@ retry:
        if ( rs->sr_err == LDAP_SERVER_DOWN && retrying ) {
                retrying &= ~LDAP_BACK_RETRYING;
                if ( ldap_back_retry( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
+                       /* if the identity changed, there might be need to re-authz */
+                       (void)ldap_back_proxy_authz_ctrl_free( op, &ctrls );
                        goto retry;
                }
        }