Merge remote branch 'origin/mdb.master'

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

diff --git a/servers/slapd/back-ldap/modrdn.c b/servers/slapd/back-ldap/modrdn.c
index 35a8125b7b6d33d1fce8a253ee09e6ec0efe8825..a4c99fcc535966284f994b3b6dda6f8261292605 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-2004 The OpenLDAP Foundation.
+ * Copyright 1999-2012 The OpenLDAP Foundation.
  * Portions Copyright 1999-2003 Howard Chu.
  * Portions Copyright 2000-2003 Pierangelo Masarati.
  * All rights reserved.
@@ -36,51 +36,88 @@ ldap_back_modrdn(
                Operation       *op,
                SlapReply       *rs )
 {
-       struct ldapconn *lc;
-       ber_int_t       msgid;
-       LDAPControl     **ctrls = NULL;
-       int             do_retry = 1;
-       int             rc = LDAP_SUCCESS;
-       char            *newSup = NULL;
-
-       lc = ldap_back_getconn( op, rs );
-       if ( !lc || !ldap_back_dobind( lc, op, rs ) ) {
-               return( -1 );
+       ldapinfo_t              *li = (ldapinfo_t *)op->o_bd->be_private;
+
+       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;
+       struct berval           newrdn = BER_BVNULL;
+
+       if ( !ldap_back_dobind( &lc, op, rs, LDAP_BACK_SENDERR ) ) {
+               return rs->sr_err;
        }
 
        if ( op->orr_newSup ) {
-               int     version = LDAP_VERSION3;
+               /* needs LDAPv3 */
+               switch ( li->li_version ) {
+               case LDAP_VERSION3:
+                       break;
+
+               case 0:
+                       if ( op->o_protocol == 0 || op->o_protocol == LDAP_VERSION3 ) {
+                               break;
+                       }
+                       /* fall thru */
+
+               default:
+                       /* op->o_protocol cannot be anything but LDAPv3,
+                        * otherwise wouldn't be here */
+                       rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
+                       send_ldap_result( op, rs );
+                       goto cleanup;
+               }
                
-               ldap_set_option( lc->lc_ld, LDAP_OPT_PROTOCOL_VERSION, &version );
                newSup = op->orr_newSup->bv_val;
        }
 
+       /* NOTE: we need to copy the newRDN in case it was formed
+        * from a DN by simply changing the length (ITS#5397) */
+       newrdn = op->orr_newrdn;
+       if ( newrdn.bv_val[ newrdn.bv_len ] != '\0' ) {
+               ber_dupbv_x( &newrdn, &op->orr_newrdn, op->o_tmpmemctx );
+       }
+
+retry:
        ctrls = op->o_ctrls;
-#ifdef LDAP_BACK_PROXY_AUTHZ
-       rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls );
+       rc = ldap_back_controls_add( op, rs, lc, &ctrls );
        if ( rc != LDAP_SUCCESS ) {
                send_ldap_result( op, rs );
                rc = -1;
                goto cleanup;
        }
-#endif /* LDAP_BACK_PROXY_AUTHZ */
 
-retry:
-       rs->sr_err = ldap_rename( lc->lc_ld, op->o_req_ndn.bv_val,
-                       op->orr_newrdn.bv_val, newSup,
+       rs->sr_err = ldap_rename( lc->lc_ld, op->o_req_dn.bv_val,
+                       newrdn.bv_val, newSup,
                        op->orr_deleteoldrdn, ctrls, NULL, &msgid );
-       rc = ldap_back_op_result( lc, op, rs, msgid, 1 );
-       if ( rs->sr_err == LDAP_SERVER_DOWN && do_retry ) {
-               do_retry = 0;
-               if ( ldap_back_retry( lc, op, rs ) ) {
+       rc = ldap_back_op_result( lc, op, rs, msgid,
+               li->li_timeout[ SLAP_OP_MODRDN ],
+               ( LDAP_BACK_SENDRESULT | retrying ) );
+       if ( rs->sr_err == LDAP_UNAVAILABLE && 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_controls_free( op, rs, &ctrls );
                        goto retry;
                }
        }
 
+       ldap_pvt_thread_mutex_lock( &li->li_counter_mutex );
+       ldap_pvt_mp_add( li->li_ops_completed[ SLAP_OP_MODRDN ], 1 );
+       ldap_pvt_thread_mutex_unlock( &li->li_counter_mutex );
+
 cleanup:
-#ifdef LDAP_BACK_PROXY_AUTHZ
-       (void)ldap_back_proxy_authz_ctrl_free( op, &ctrls );
-#endif /* LDAP_BACK_PROXY_AUTHZ */
+       (void)ldap_back_controls_free( op, rs, &ctrls );
+
+       if ( newrdn.bv_val != op->orr_newrdn.bv_val ) {
+               op->o_tmpfree( newrdn.bv_val, op->o_tmpmemctx );
+       }
+
+       if ( lc != NULL ) {
+               ldap_back_release_conn( li, lc );
+       }
 
        return rc;
 }