Add back-ndb

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

diff --git a/servers/slapd/back-meta/modrdn.c b/servers/slapd/back-meta/modrdn.c
index 6123fd25331667edacc385ad96634a4476ff6dc5..90f708e9d645e34128feac7525a7697130ec0c07 100644 (file)
--- a/servers/slapd/back-meta/modrdn.c
+++ b/servers/slapd/back-meta/modrdn.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1999-2005 The OpenLDAP Foundation.
+ * Copyright 1999-2008 The OpenLDAP Foundation.
  * Portions Copyright 2001-2003 Pierangelo Masarati.
  * Portions Copyright 1999-2003 Howard Chu.
  * All rights reserved.
@@ -34,36 +34,31 @@
 int
 meta_back_modrdn( Operation *op, SlapReply *rs )
 {
-       struct metainfo         *li = ( struct metainfo * )op->o_bd->be_private;
-       struct metaconn         *lc;
-       int                     rc = 0;
-       int                     candidate = -1;
-       struct berval           mdn = BER_BVNULL,
-                               mnewSuperior = BER_BVNULL;
-       dncookie                dc;
-
-       lc = meta_back_getconn( op, rs, &candidate, LDAP_BACK_SENDERR );
-       if ( !lc ) {
+       metainfo_t      *mi = ( metainfo_t * )op->o_bd->be_private;
+       metatarget_t    *mt;
+       metaconn_t      *mc;
+       int             candidate = -1;
+       struct berval   mdn = BER_BVNULL,
+                       mnewSuperior = BER_BVNULL;
+       dncookie        dc;
+       int             msgid;
+       int             do_retry = 1;
+       LDAPControl     **ctrls = NULL;
+       struct berval   newrdn = BER_BVNULL;
+
+       mc = meta_back_getconn( op, rs, &candidate, LDAP_BACK_SENDERR );
+       if ( !mc || !meta_back_dobind( op, rs, mc, LDAP_BACK_SENDERR ) ) {
                return rs->sr_err;
        }
 
-       assert( candidate != META_TARGET_NONE );
-
-       if ( !meta_back_dobind( lc, op, LDAP_BACK_SENDERR ) ) {
-               return rs->sr_err;
-       }
-               
-       if ( !meta_back_is_valid( lc, candidate ) ) {
-               rs->sr_err = LDAP_OTHER;
-               send_ldap_result( op, rs );
-               return rs->sr_err;
-       }
+       assert( mc->mc_conns[ candidate ].msc_ld != NULL );
 
+       mt = mi->mi_targets[ candidate ];
+       dc.target = mt;
        dc.conn = op->o_conn;
        dc.rs = rs;
 
        if ( op->orr_newSup ) {
-               int     version = LDAP_VERSION3;
 
                /*
                 * NOTE: the newParent, if defined, must be on the 
@@ -84,18 +79,32 @@ meta_back_modrdn( Operation *op, SlapReply *rs )
                 * feature from back-ldap
                 */
 
-               /* newSuperior needs LDAPv3; if we got here, we can safely
-                * enforce it */
-               ldap_set_option( lc->mc_conns[ candidate ].msc_ld,
-                               LDAP_OPT_PROTOCOL_VERSION, &version );
-
+               /* needs LDAPv3 */
+               switch ( mt->mt_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;
+               }
+               
                /*
                 * Rewrite the new superior, if defined and required
                 */
-               dc.rwmap = &li->mi_targets[ candidate ]->mt_rwmap;
                dc.ctx = "newSuperiorDN";
                if ( ldap_back_dn_massage( &dc, op->orr_newSup, &mnewSuperior ) ) {
-                       rc = -1;
+                       rs->sr_err = LDAP_OTHER;
+                       send_ldap_result( op, rs );
                        goto cleanup;
                }
        }
@@ -103,20 +112,46 @@ meta_back_modrdn( Operation *op, SlapReply *rs )
        /*
         * Rewrite the modrdn dn, if required
         */
-       dc.rwmap = &li->mi_targets[ candidate ]->mt_rwmap;
        dc.ctx = "modrDN";
        if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
-               rc = -1;
+               rs->sr_err = LDAP_OTHER;
+               send_ldap_result( op, rs );
                goto cleanup;
        }
 
-       rc = ldap_rename_s( lc->mc_conns[ candidate ].msc_ld, mdn.bv_val,
-                       op->orr_newrdn.bv_val,
-                       mnewSuperior.bv_val,
-                       op->orr_deleteoldrdn,
-                       op->o_ctrls, NULL ) != LDAP_SUCCESS;
+       /* 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;
+       if ( meta_back_controls_add( op, rs, mc, candidate, &ctrls ) != LDAP_SUCCESS )
+       {
+               send_ldap_result( op, rs );
+               goto cleanup;
+       }
+
+       rs->sr_err = ldap_rename( mc->mc_conns[ candidate ].msc_ld,
+                       mdn.bv_val, newrdn.bv_val,
+                       mnewSuperior.bv_val, op->orr_deleteoldrdn,
+                       ctrls, NULL, &msgid );
+       rs->sr_err = meta_back_op_result( mc, op, rs, candidate, msgid,
+               mt->mt_timeout[ SLAP_OP_MODRDN ], LDAP_BACK_SENDRESULT );
+       if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
+               do_retry = 0;
+               if ( meta_back_retry( op, rs, &mc, candidate, LDAP_BACK_SENDERR ) ) {
+                       /* if the identity changed, there might be need to re-authz */
+                       (void)mi->mi_ldap_extra->controls_free( op, rs, &ctrls );
+                       goto retry;
+               }
+       }
 
 cleanup:;
+       (void)mi->mi_ldap_extra->controls_free( op, rs, &ctrls );
+
        if ( mdn.bv_val != op->o_req_dn.bv_val ) {
                free( mdn.bv_val );
                BER_BVZERO( &mdn );
@@ -129,13 +164,14 @@ cleanup:;
                BER_BVZERO( &mnewSuperior );
        }
 
-       if ( rc == 0 ) {
-               return meta_back_op_result( lc, op, rs, candidate ) == LDAP_SUCCESS
-                       ? 0 : 1;
-       } /* else */
+       if ( newrdn.bv_val != op->orr_newrdn.bv_val ) {
+               op->o_tmpfree( newrdn.bv_val, op->o_tmpmemctx );
+       }
 
-       send_ldap_result( op, rs );
+       if ( mc ) {
+               meta_back_release_conn( mi, mc );
+       }
 
-       return rc;
+       return rs->sr_err;
 }