From: Howard Chu <hyc@openldap.org>
Date: Mon, 26 Mar 2012 10:01:58 +0000 (-0700)
Subject: ITS#7205 fix check for existing suffix
X-Git-Tag: OPENLDAP_REL_ENG_2_4_31~59
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cc6aa5211882af3a02e79a9380f2284f449449b1;p=openldap

ITS#7205 fix check for existing suffix
---

diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index e7227d5ab8..0ad60aa463 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -2938,7 +2938,8 @@ config_suffix(ConfigArgs *c)
 	}
 #endif
 
-	if (SLAP_DB_ONE_SUFFIX( c->be ) && c->be->be_suffix ) {
+	if (SLAP_DB_ONE_SUFFIX( c->be ) && c->be->be_suffix &&
+		!BER_BVISNULL( &c->be->be_suffix[0] )) {
 		snprintf( c->cr_msg, sizeof( c->cr_msg ), "<%s> Only one suffix is allowed on this %s backend",
 			c->argv[0], c->be->bd_info->bi_type );
 		Debug(LDAP_DEBUG_ANY, "%s: %s\n",