From: Howard Chu <hyc@openldap.org>
Date: Fri, 28 Dec 2001 09:48:52 +0000 (+0000)
Subject: Fix modrdn newSuperior checks
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~435
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=514f605ef5c113998be8bd1c046d54e1fc91d24a;p=openldap

Fix modrdn newSuperior checks
---

diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c
index c67b5a3180..15c4973495 100644
--- a/servers/slapd/back-bdb/modrdn.c
+++ b/servers/slapd/back-bdb/modrdn.c
@@ -268,7 +268,7 @@ retry:	/* transaction retry */
 
 	new_parent_dn = &p_dn;	/* New Parent unless newSuperior given */
 
-	if ( newSuperior != NULL ) {
+	if ( newSuperior->bv_val != NULL ) {
 		Debug( LDAP_DEBUG_TRACE, 
 			"bdb_modrdn: new parent \"%s\" requested...\n",
 			newSuperior->bv_val, 0, 0 );
diff --git a/servers/slapd/back-ldbm/modrdn.c b/servers/slapd/back-ldbm/modrdn.c
index d62ca57599..107986c9ff 100644
--- a/servers/slapd/back-ldbm/modrdn.c
+++ b/servers/slapd/back-ldbm/modrdn.c
@@ -281,7 +281,7 @@ ldbm_back_modrdn(
 
 	new_parent_dn = &p_dn;	/* New Parent unless newSuperior given */
 
-	if ( newSuperior != NULL ) {
+	if ( newSuperior->bv_val != NULL ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
 			"ldbm_back_modrdn: new parent \"%s\" requested\n",
@@ -314,7 +314,7 @@ ldbm_back_modrdn(
 		}
 	}
 
-	if ( newSuperior != NULL ) {
+	if ( newSuperior && newSuperior->bv_val != NULL ) {
 		/* newSuperior == entry being moved?, if so ==> ERROR */
 		/* Get Entry with dn=newSuperior. Does newSuperior exist? */