fix ITS#4071

[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..741571c32d66cd930bb548dd92135e8434fd1cb6 100644 (file)
--- a/servers/slapd/back-meta/modrdn.c
+++ b/servers/slapd/back-meta/modrdn.c
@@ -34,30 +34,21 @@
 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;
+       metaconn_t      *mc;
+       int             candidate = -1;
+       struct berval   mdn = BER_BVNULL,
+                       mnewSuperior = BER_BVNULL;
+       dncookie        dc;
+       int             msgid;
+       int             do_retry = 1;
+
+       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 );
 
        dc.conn = op->o_conn;
        dc.rs = rs;
@@ -86,16 +77,16 @@ meta_back_modrdn( Operation *op, SlapReply *rs )
 
                /* newSuperior needs LDAPv3; if we got here, we can safely
                 * enforce it */
-               ldap_set_option( lc->mc_conns[ candidate ].msc_ld,
+               ldap_set_option( mc->mc_conns[ candidate ].msc_ld,
                                LDAP_OPT_PROTOCOL_VERSION, &version );
 
                /*
                 * Rewrite the new superior, if defined and required
                 */
-               dc.rwmap = &li->mi_targets[ candidate ]->mt_rwmap;
+               dc.target = &mi->mi_targets[ candidate ];
                dc.ctx = "newSuperiorDN";
                if ( ldap_back_dn_massage( &dc, op->orr_newSup, &mnewSuperior ) ) {
-                       rc = -1;
+                       rs->sr_err = LDAP_OTHER;
                        goto cleanup;
                }
        }
@@ -103,18 +94,62 @@ meta_back_modrdn( Operation *op, SlapReply *rs )
        /*
         * Rewrite the modrdn dn, if required
         */
-       dc.rwmap = &li->mi_targets[ candidate ]->mt_rwmap;
+       dc.target = &mi->mi_targets[ candidate ];
        dc.ctx = "modrDN";
        if ( ldap_back_dn_massage( &dc, &op->o_req_dn, &mdn ) ) {
-               rc = -1;
+               rs->sr_err = LDAP_OTHER;
                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;
+retry:;
+       rs->sr_err = ldap_rename( mc->mc_conns[ candidate ].msc_ld,
+                       mdn.bv_val, op->orr_newrdn.bv_val,
+                       mnewSuperior.bv_val, op->orr_deleteoldrdn,
+                       op->o_ctrls, NULL, &msgid );
+       if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
+               do_retry = 0;
+               if ( meta_back_retry( op, rs, mc, candidate, LDAP_BACK_SENDERR ) ) {
+                       goto retry;
+               }
+
+       } else if ( rs->sr_err == LDAP_SUCCESS ) {
+               struct timeval  tv, *tvp = NULL;
+               LDAPMessage     *res = NULL;
+               int             rc;
+
+               if ( mi->mi_targets[ candidate ].mt_timeout[ META_OP_MODRDN ] != 0 ) {
+                       tv.tv_sec = mi->mi_targets[ candidate ].mt_timeout[ META_OP_MODRDN ];
+                       tv.tv_usec = 0;
+                       tvp = &tv;
+               }
+
+               rs->sr_err = LDAP_OTHER;
+               rc = ldap_result( mc->mc_conns[ candidate ].msc_ld,
+                       msgid, LDAP_MSG_ONE, tvp, &res );
+               switch ( rc ) {
+               case -1:
+                       break;
+
+               case 0:
+                       ldap_abandon_ext( mc->mc_conns[ candidate ].msc_ld,
+                               msgid, NULL, NULL );
+                       rs->sr_err = op->o_protocol >= LDAP_VERSION3 ?
+                               LDAP_ADMINLIMIT_EXCEEDED : LDAP_OPERATIONS_ERROR;
+                       break;
+
+               case LDAP_RES_RENAME:
+                       rc = ldap_parse_result( mc->mc_conns[ candidate ].msc_ld,
+                               res, &rs->sr_err, NULL, NULL, NULL, NULL, 1 );
+                       if ( rc != LDAP_SUCCESS ) {
+                               rs->sr_err = rc;
+                       }
+                       break;
+
+               default:
+                       ldap_msgfree( res );
+                       break;
+               }
+       }
 
 cleanup:;
        if ( mdn.bv_val != op->o_req_dn.bv_val ) {
@@ -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 ( rs->sr_err == LDAP_SUCCESS ) {
+               meta_back_op_result( mc, op, rs, candidate );
+       } else {
+               send_ldap_result( op, rs );
+       }
 
-       send_ldap_result( op, rs );
+       meta_back_release_conn( op, mc );
 
-       return rc;
+       return rs->sr_err;
 }