ITS#3344: initialize threads early

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 337513327947ef79bb5c33d63859909fc6b07e52..c20bb4bbd64ce8eb4bf65517d362568f2196352c 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -113,8 +113,6 @@ slap_init( int mode, const char *name )
 
                slap_name = name;
 
-               (void) ldap_pvt_thread_initialize();
-
                ldap_pvt_thread_pool_init( &connection_pool,
                                connection_pool_max, 0);
 

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 864463d9c0c2019ce4f52e17c0a29179b758ab89..01fbf316af4f763501d0a60c363bb8174c619659 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -501,6 +501,8 @@ unhandled_option:;
                }
        }
 
+       (void) ldap_pvt_thread_initialize();
+
        lutil_set_debug_level( "slapd", slap_debug );
        ber_set_option(NULL, LBER_OPT_DEBUG_LEVEL, &slap_debug);
        ldap_set_option(NULL, LDAP_OPT_DEBUG_LEVEL, &slap_debug);