ITS#4911 from HEAD, move slap_op_init/destroy

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 9a048b64eb5417f0a0095d7569cee92ae1b55962..2d61908629d3a556f020723fff62a9a625180826 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -104,6 +104,8 @@ slap_init( int mode, const char *name )
 
        slapMode = mode;
 
+       slap_op_init();
+
 #ifdef SLAPD_MODULES
        if ( module_init() != 0 ) {
                ldap_debug |= 1;
@@ -339,8 +341,10 @@ int slap_destroy(void)
 
        }
 
+       slap_op_destroy();
+
        ldap_pvt_thread_destroy();
 
-       /* should destory the above mutex */
+       /* should destroy the above mutex */
        return rc;
 }

diff --git a/servers/slapd/main.c b/servers/slapd/main.c
index 7cff762abe425eb80e8f380ec7812b8d5095105a..4dc163838245f5328ba5cf50019055d1c6d953af 100644 (file)
--- a/servers/slapd/main.c
+++ b/servers/slapd/main.c
@@ -656,7 +656,6 @@ unhandled_option:;
 
        extops_init();
        lutil_passwd_init();
-       slap_op_init();
 
        rc = slap_init( serverMode, serverName );
        if ( rc ) {
@@ -883,8 +882,6 @@ destroy:
        module_kill();
 #endif
 
-       slap_op_destroy();
-
        extops_kill();
 
 stop: