From 1faf38448b8daba3ba0d8d8d6e6b850f2c71992a Mon Sep 17 00:00:00 2001
From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 7 Nov 2005 01:08:41 +0000
Subject: [PATCH] fix root entry delete/add

---
 servers/slapd/back-sql/add.c    | 52 ++++++++++++++++-----------------
 servers/slapd/back-sql/delete.c |  2 +-
 2 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/servers/slapd/back-sql/add.c b/servers/slapd/back-sql/add.c
index e82eae5bed..15c3b9742a 100644
--- a/servers/slapd/back-sql/add.c
+++ b/servers/slapd/back-sql/add.c
@@ -1111,34 +1111,34 @@ backsql_add( Operation *op, SlapReply *rs )
 
 	} else {
 		dnParent( &op->ora_e->e_nname, &pdn );
-	}
 
-	/*
-	 * Get the parent
-	 */
-	bsi.bsi_e = &p;
-	rs->sr_err = backsql_init_search( &bsi, &pdn,
-			LDAP_SCOPE_BASE, 
-			(time_t)(-1), NULL, dbh, op, rs, slap_anlist_no_attrs,
-			( BACKSQL_ISF_MATCHED | BACKSQL_ISF_GET_ENTRY ) );
-	if ( rs->sr_err != LDAP_SUCCESS ) {
-		Debug( LDAP_DEBUG_TRACE, "backsql_add(): "
-			"could not retrieve addDN parent "
-			"\"%s\" ID - %s matched=\"%s\"\n", 
-			pdn.bv_val,
-			rs->sr_err == LDAP_REFERRAL ? "referral" : "no such entry",
-			rs->sr_matched ? rs->sr_matched : "(null)" );
-		e = &p;
-		goto done;
-	}
+		/*
+		 * Get the parent
+		 */
+		bsi.bsi_e = &p;
+		rs->sr_err = backsql_init_search( &bsi, &pdn,
+				LDAP_SCOPE_BASE, 
+				(time_t)(-1), NULL, dbh, op, rs, slap_anlist_no_attrs,
+				( BACKSQL_ISF_MATCHED | BACKSQL_ISF_GET_ENTRY ) );
+		if ( rs->sr_err != LDAP_SUCCESS ) {
+			Debug( LDAP_DEBUG_TRACE, "backsql_add(): "
+				"could not retrieve addDN parent "
+				"\"%s\" ID - %s matched=\"%s\"\n", 
+				pdn.bv_val,
+				rs->sr_err == LDAP_REFERRAL ? "referral" : "no such entry",
+				rs->sr_matched ? rs->sr_matched : "(null)" );
+			e = &p;
+			goto done;
+		}
 
-	/* check "children" pseudo-attribute access to parent */
-	if ( !access_allowed( op, &p, slap_schema.si_ad_children,
-				NULL, ACL_WADD, NULL ) )
-	{
-		rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
-		e = &p;
-		goto done;
+		/* check "children" pseudo-attribute access to parent */
+		if ( !access_allowed( op, &p, slap_schema.si_ad_children,
+					NULL, ACL_WADD, NULL ) )
+		{
+			rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
+			e = &p;
+			goto done;
+		}
 	}
 
 	if ( get_assert( op ) &&
diff --git a/servers/slapd/back-sql/delete.c b/servers/slapd/back-sql/delete.c
index 2d920a4656..0ee1ec2ecd 100644
--- a/servers/slapd/back-sql/delete.c
+++ b/servers/slapd/back-sql/delete.c
@@ -217,10 +217,10 @@ backsql_delete( Operation *op, SlapReply *rs )
 	/*
 	 * Get the parent
 	 */
+	e_id = bsi.bsi_base_id;
 	if ( !be_issuffix( op->o_bd, &op->o_req_ndn ) ) {
 		dnParent( &op->o_req_ndn, &pdn );
 		bsi.bsi_e = &p;
-		e_id = bsi.bsi_base_id;
 		rs->sr_err = backsql_init_search( &bsi, &pdn,
 				LDAP_SCOPE_BASE, 
 				(time_t)(-1), NULL, dbh, op, rs,
-- 
2.39.5