From: Pierangelo Masarati <ando@openldap.org>
Date: Mon, 16 Jan 2006 23:14:21 +0000 (+0000)
Subject: refine previous commit (error out before actual add)
X-Git-Tag: OPENLDAP_REL_ENG_2_4_BP~297
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=324174fc76dd3d339dafb9c1eb32111dfd95e116;p=openldap

refine previous commit (error out before actual add)
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 97ca21c719..00ec4b4e9e 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -3626,9 +3626,19 @@ config_add_internal( CfBackInfo *cfb, Entry *e, ConfigArgs *ca, SlapReply *rs, i
 	 * These entries can have auto-assigned indexes (appended to the end)
 	 * but only the other types support auto-renumbering of siblings.
 	 */
-	rc = check_name_index( last, colst[0]->co_type, e, rs, renum );
-	if ( rc )
-		goto done;
+	{
+		int renumber = renum ? *renum : 0;
+		rc = check_name_index( last, colst[0]->co_type, e, rs, renum );
+		if ( rc ) {
+			goto done;
+		}
+		if ( renum && *renum && renumber == -1 ) {
+			snprintf( ca->msg, sizeof( ca->msg ),
+				"operation requires sibling renumbering" );
+			rc = LDAP_UNWILLING_TO_PERFORM;
+			goto done;
+		}
+	}
 
 	init_config_argv( ca );
 
@@ -3746,6 +3756,8 @@ config_back_add( Operation *op, SlapReply *rs )
 	 * 4) store entry in underlying database
 	 * 5) perform any necessary renumbering
 	 */
+	/* NOTE: by now we do not accept adds that require renumbering */
+	renumber = -1;
 	rs->sr_err = config_add_internal( cfb, op->ora_e, &ca, rs, &renumber );
 	if ( rs->sr_err != LDAP_SUCCESS ) {
 		rs->sr_text = ca.msg;
@@ -3770,10 +3782,6 @@ config_back_add( Operation *op, SlapReply *rs )
 		op->o_dn = dn;
 		op->o_ndn = ndn;
 	}
-	if ( renumber ) {
-		rs->sr_err = LDAP_UNWILLING_TO_PERFORM;
-		rs->sr_text = "renaming not implemented yet within naming context";
-	}
 
 	ldap_pvt_thread_pool_resume( &connection_pool );