From: Pierangelo Masarati <ando@openldap.org>
Date: Thu, 17 Jan 2002 22:47:55 +0000 (+0000)
Subject: dn_parent => dnParent
X-Git-Tag: LDBM_PRE_GIANT_RWLOCK~86
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=9b4f9336495d38945924812c91c99fa4f0b57dbc;p=openldap

dn_parent => dnParent
---

diff --git a/servers/slapd/back-bdb/modrdn.c b/servers/slapd/back-bdb/modrdn.c
index 086fa20a68..2169b4a542 100644
--- a/servers/slapd/back-bdb/modrdn.c
+++ b/servers/slapd/back-bdb/modrdn.c
@@ -159,11 +159,17 @@ retry:	/* transaction retry */
 		goto done;
 	}
 
-	p_ndn.bv_val = dn_parent( be, e->e_ndn );
-	if (p_ndn.bv_val && *p_ndn.bv_val)
-		p_ndn.bv_len = e->e_nname.bv_len - (p_ndn.bv_val - e->e_ndn);
-	else
+	if ( be_issuffix( be, e->e_nname.bv_val ) ) {
 		p_ndn.bv_len = 0;
+		p_ndn.bv_val = "";
+	} else {
+		rc = dnParent( e->e_nname.bv_val, (const char **)&p_ndn.bv_val );
+		if ( rc != LDAP_SUCCESS ) {
+			text = "internal error";
+			goto return_results;
+		}
+		p_ndn.bv_len = e->e_nname.bv_len - (p_ndn.bv_val - e->e_nname.bv_val);
+	}
 	np_ndn = &p_ndn;
 	if ( p_ndn.bv_len != 0 ) {
 		/* Make sure parent entry exist and we can write its 
@@ -206,11 +212,17 @@ retry:	/* transaction retry */
 			"bdb_modrdn: wr to children of entry %s OK\n",
 			p_ndn.bv_val, 0, 0 );
 		
-		p_dn.bv_val = dn_parent( be, e->e_dn );
-		if (p_dn.bv_val && *p_dn.bv_val)
-			p_dn.bv_len = e->e_name.bv_len - (p_dn.bv_val - e->e_dn);
-		else
+		if ( be_issuffix( be, e->e_name.bv_val ) ) {
 			p_dn.bv_len = 0;
+			p_dn.bv_val = "";
+		} else {
+			rc = dnParent( e->e_name.bv_val, &p_dn.bv_val );
+			if ( rc != LDAP_SUCCESS ) {
+				text = "internal error";
+				goto return_results;
+			}
+			p_dn.bv_len = e->e_name.bv_len - (p_dn.bv_val - e->e_name.bv_val);
+		}
 
 		Debug( LDAP_DEBUG_TRACE,
 			"bdb_modrdn: parent dn=%s\n",