Minor fixes

diff --git a/servers/slapd/back-mdb/modrdn.c b/servers/slapd/back-mdb/modrdn.c
index fc9e04a99cab2bfdfd3d2baf1b9ae20e09ef1f39..b7b406299bba2e1793f05ff5491ceef745f8a672 100644 (file)
--- a/servers/slapd/back-mdb/modrdn.c
+++ b/servers/slapd/back-mdb/modrdn.c
@@ -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,

diff --git a/servers/slapd/back-mdb/referral.c b/servers/slapd/back-mdb/referral.c
index 1c28434f321218eb81356de7f853c6cd0f2afcab..08fb00391a27a96388464146ae256aacaae2d86e 100644 (file)
--- a/servers/slapd/back-mdb/referral.c
+++ b/servers/slapd/back-mdb/referral.c
@@ -149,6 +149,7 @@ done:
                        op->o_tmpfree( moi, op->o_tmpmemctx );
                }
        }
-       mdb_entry_return( e );
+       if ( e )
+               mdb_entry_return( e );
        return rc;
 }