import fix to ITS#4798

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

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index eb5690ce6c1b9b0d040144d48f501c2b33713c74..802701d622e74496030ed30cce73954887a9c09e 100644 (file)
--- a/servers/slapd/back-ldap/modrdn.c
+++ b/servers/slapd/back-ldap/modrdn.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2006 The OpenLDAP Foundation.
+ * Copyright 1999-2007 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -36,17 +36,16 @@ ldap_back_modrdn(
                Operation       *op,
                SlapReply       *rs )
 {
-       ldapinfo_t      *li = (ldapinfo_t *)op->o_bd->be_private;
+       ldapinfo_t              *li = (ldapinfo_t *)op->o_bd->be_private;
 
-       ldapconn_t      *lc;
-       ber_int_t       msgid;
-       LDAPControl     **ctrls = NULL;
-       int             do_retry = 1;
-       int             rc = LDAP_SUCCESS;
-       char            *newSup = NULL;
+       ldapconn_t              *lc = NULL;
+       ber_int_t               msgid;
+       LDAPControl             **ctrls = NULL;
+       ldap_back_send_t        retrying = LDAP_BACK_RETRYING;
+       int                     rc = LDAP_SUCCESS;
+       char                    *newSup = NULL;
 
-       lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
-       if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
+       if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
                return rs->sr_err;
        }
 
@@ -73,23 +72,27 @@ ldap_back_modrdn(
                newSup = op->orr_newSup->bv_val;
        }
 
+retry:
        ctrls = op->o_ctrls;
-       rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls );
+       rc = ldap_back_proxy_authz_ctrl( &lc->lc_bound_ndn,
+               li->li_version, &li->li_idassert, op, rs, &ctrls );
        if ( rc != LDAP_SUCCESS ) {
                send_ldap_result( op, rs );
                rc = -1;
                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 );
        rc = ldap_back_op_result( lc, op, rs, msgid,
-               li->li_timeout[ LDAP_BACK_OP_MODRDN ], LDAP_BACK_SENDRESULT );
-       if ( rs->sr_err == LDAP_SERVER_DOWN && do_retry ) {
-               do_retry = 0;
+               li->li_timeout[ SLAP_OP_MODRDN ],
+               ( LDAP_BACK_SENDRESULT | retrying ) );
+       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;
                }
        }