Minor fixes

This commit is contained in:
Howard Chu 2011-08-24 05:41:52 -07:00
parent 450c6c7e6d
commit b19b7ae9b9
2 changed files with 5 additions and 4 deletions

View file

@ -118,7 +118,7 @@ txnReturn:
txn = moi->moi_txn;
if ( be_issuffix( op->o_bd, &e->e_nname ) ) {
if ( be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
#ifdef MDB_MULTIPLE_SUFFIXES
/* Allow renaming one suffix entry to another */
p_ndn = slap_empty_bv;
@ -129,7 +129,7 @@ txnReturn:
goto return_results;
#endif
} else {
dnParent( &e->e_nname, &p_ndn );
dnParent( &op->o_req_ndn, &p_ndn );
}
np_ndn = &p_ndn;
/* Make sure parent entry exist and we can write its
@ -176,7 +176,7 @@ txnReturn:
if ( p_ndn.bv_val == slap_empty_bv.bv_val ) {
p_dn = slap_empty_bv;
} else {
dnParent( &e->e_name, &p_dn );
dnParent( &op->o_req_dn, &p_dn );
}
Debug( LDAP_DEBUG_TRACE,

View file

@ -149,6 +149,7 @@ done:
op->o_tmpfree( moi, op->o_tmpmemctx );
}
}
mdb_entry_return( e );
if ( e )
mdb_entry_return( e );
return rc;
}