Use recursive mutex to avoid deadlocks

[openldap] / servers / slapd / modrdn.c

diff --git a/servers/slapd/modrdn.c b/servers/slapd/modrdn.c
index 328f49ec60feac9ea65b2c7790ecd362980ca96f..258519349e9e00f95ae07c5fa867b4eb86f1dce0 100644 (file)
--- a/servers/slapd/modrdn.c
+++ b/servers/slapd/modrdn.c
@@ -184,6 +184,12 @@ do_modrdn(
        op->o_bd = frontendDB;
        rs->sr_err = frontendDB->be_modrdn( op, rs );
 
+#ifdef LDAP_X_TXN
+       if( rs->sr_err == LDAP_X_TXN_SPECIFY_OKAY ) {
+               /* skip cleanup */
+       }
+#endif
+
 cleanup:
        op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
        op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
@@ -194,10 +200,12 @@ cleanup:
        if ( op->orr_modlist != NULL )
                slap_mods_free( op->orr_modlist, 1 );
 
-       if ( !BER_BVISNULL( &pnewSuperior ) ) 
+       if ( !BER_BVISNULL( &pnewSuperior ) ) {
                op->o_tmpfree( pnewSuperior.bv_val, op->o_tmpmemctx );
-       if ( !BER_BVISNULL( &nnewSuperior ) )
+       }
+       if ( !BER_BVISNULL( &nnewSuperior ) ) {
                op->o_tmpfree( nnewSuperior.bv_val, op->o_tmpmemctx );
+       }
 
        return rs->sr_err;
 }
@@ -296,17 +304,13 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
        if ( op->o_bd->be_modrdn ) {
                /* do the update here */
                int repl_user = be_isupdate( op );
-#ifndef SLAPD_MULTIMASTER
-               if ( !SLAP_SHADOW(op->o_bd) || repl_user )
-#endif /* ! SLAPD_MULTIMASTER */
+               if ( !SLAP_SINGLE_SHADOW(op->o_bd) || repl_user )
                {
                        slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
 
                        op->o_bd = op_be;
 
-#ifdef SLAPD_MULTIMASTER
                        if ( !op->o_bd->be_update_ndn.bv_len || !repl_user )
-#endif /* SLAPD_MULTIMASTER */
                        {
                                cb.sc_next = op->o_callback;
                                op->o_callback = &cb;
@@ -352,7 +356,6 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
                                op->o_delete_glue_parent = 0;
                        }
 
-#ifndef SLAPD_MULTIMASTER
                } else {
                        BerVarray defref = op->o_bd->be_update_refs
                                ? op->o_bd->be_update_refs : default_referral;
@@ -370,7 +373,6 @@ fe_op_modrdn( Operation *op, SlapReply *rs )
                                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
                                        "shadow context; no update referral" );
                        }
-#endif /* ! SLAPD_MULTIMASTER */
                }
        } else {
                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
@@ -500,13 +502,6 @@ slap_modrdn2mods(
        
 done:
 
-#if 0
-       /* should be done by backend */
-       if ( rs->sr_err == LDAP_SUCCESS && !repl_user ) {
-               slap_mods_opattrs( op, &op->orr_modlist, 1 );
-       }
-#endif
-
        /* LDAP v2 supporting correct attribute handling. */
        if ( rs->sr_err != LDAP_SUCCESS && op->orr_modlist != NULL ) {
                Modifications *tmp;