From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 20 Dec 2005 20:05:00 +0000 (+0000)
Subject: ITS#4249 changes from HEAD
X-Git-Tag: OPENLDAP_REL_ENG_2_3_14~44
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7fc291b9aa2d602bc0eecbf628d6edb147c77fa3;p=openldap

ITS#4249 changes from HEAD
---

diff --git a/CHANGES b/CHANGES
index b7b949cd5c..0370c083d5 100644
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.3.14 Engineering
 	Fixed slapd ACL exact attrval clause needs normalization (ITS#4255)
 	Fixed slapd sc_prev update after free bug (ITS#4237)
 	Fixed slapd issues (ITS#4243,4251)
+	Fixed slapd cn=config (ITS#4249)
 	Fixed slapd-bdb/hdb mode argument parsing (ITS#4257)
 	Fixed slapd-bdb/hdb cn=config reindexing (ITS#4260)
 	Fixed slapd-bdb/hdb cn=config olcDbIndex modify/replace (ITS#4262)
diff --git a/servers/slapd/bconfig.c b/servers/slapd/bconfig.c
index 16bd6cfe6c..b138b2ccbc 100644
--- a/servers/slapd/bconfig.c
+++ b/servers/slapd/bconfig.c
@@ -1067,6 +1067,13 @@ config_generic(ConfigArgs *c) {
 			break;
 
 		case CFG_THREADS:
+			if ( c->value_int > 2 * SLAP_MAX_WORKER_THREADS ) {
+				snprintf( c->msg, sizeof( c->msg ),
+					"warning, threads=%d larger than twice the default (2*%d=%d); YMMV",
+					c->value_int, SLAP_MAX_WORKER_THREADS, 2 * SLAP_MAX_WORKER_THREADS );
+				Debug(LDAP_DEBUG_ANY, "%s: %s.\n",
+					c->log, c->msg, 0 );
+			}
 			if ( slapMode & SLAP_SERVER_MODE )
 				ldap_pvt_thread_pool_maxthreads(&connection_pool, c->value_int);
 			connection_pool_max = c->value_int;	/* save for reference */