From b19b7ae9b98d8ab217e4e10dfec3d543f796b529 Mon Sep 17 00:00:00 2001
From: Howard Chu <hyc@openldap.org>
Date: Wed, 24 Aug 2011 05:41:52 -0700
Subject: [PATCH] Minor fixes

---
 servers/slapd/back-mdb/modrdn.c   | 6 +++---
 servers/slapd/back-mdb/referral.c | 3 ++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/servers/slapd/back-mdb/modrdn.c b/servers/slapd/back-mdb/modrdn.c
index fc9e04a99c..b7b406299b 100644
--- 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 1c28434f32..08fb00391a 100644
--- 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;
 }
-- 
2.47.2