ITS#4249 changes from HEAD

diff --git a/CHANGES b/CHANGES
index b7b949cd5c4ca9e8e1adc248fb5f1142a07462ec..0370c083d5e432dcbd6cbc0b9ad06914284410fe 100644 (file)
--- 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 16bd6cfe6c026cf91bb1fe0da53443ac452ca13d..b138b2ccbc7ac494b267ad00ccc510e9a2725915 100644 (file)
--- 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 */