From: Howard Chu <hyc@openldap.org>
Date: Wed, 14 Nov 2007 01:28:29 +0000 (+0000)
Subject: Fix rev 1.266, was creating {0}config entry prematurely.
X-Git-Tag: OPENLDAP_REL_ENG_2_4_9~20^2~432
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=89c6b39738d12b1ccb0955197d1acf14ca3d4e58;p=openldap

Fix rev 1.266, was creating {0}config entry prematurely.
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index a0fa915259..4564a6f503 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -5943,6 +5943,7 @@ config_tool_entry_put( BackendDB *be, Entry *e, struct berval *text )
 	Connection conn = {0};
 	Operation *op = NULL;
 	void *thrctx;
+	int isFrontend = 0;
 
 	/* Create entry for frontend database if it does not exist already */
 	if ( !entry_put_got_frontend ) {
@@ -5992,11 +5993,12 @@ config_tool_entry_put( BackendDB *be, Entry *e, struct berval *text )
 				}
 			} else {
 				entry_put_got_frontend++;
+				isFrontend = 1;
 			}
 		}
 	}
 	/* Create entry for config database if it does not exist already */
-	if ( !entry_put_got_config ) {
+	if ( !entry_put_got_config && !isFrontend ) {
 		if ( !strncmp( e->e_nname.bv_val, "olcDatabase",
 				STRLENOF( "olcDatabase" ))) {
 			if ( strncmp( e->e_nname.bv_val +