/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
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 );
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;
}
int repl_user = be_isupdate( op );
if ( !SLAP_SINGLE_SHADOW(op->o_bd) || repl_user )
{
- slap_callback cb = { NULL, slap_replog_cb, NULL, NULL };
-
op->o_bd = op_be;
-
- if ( !op->o_bd->be_update_ndn.bv_len || !repl_user )
- {
- cb.sc_next = op->o_callback;
- op->o_callback = &cb;
- }
op->o_bd->be_modrdn( op, rs );
if ( op->o_bd->be_delete ) {
goto done;
}
}
+ rs->sr_text = NULL;
/* Add new attribute values to the entry */
for ( a_cnt = 0; new_rdn[a_cnt]; a_cnt++ ) {