ITS#3864 use sasl_ssf_t where expected

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index 3cff69e3e63765e010dc5d6537c2b74684a983b8..28f30521c6913a6eec4709a5538f39a5f9461421 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -69,8 +69,6 @@ ldap_pvt_thread_mutex_t       gmtime_mutex;
 
 slap_counters_t                        slap_counters;
 
-ldap_pvt_thread_mutex_t        replog_mutex;
-
 static const char* slap_name = NULL;
 int slapMode = SLAP_UNDEFINED_MODE;
 
@@ -94,6 +92,8 @@ slap_init( int mode, const char *name )
 
        slapMode = mode;
 
+       slap_op_init();
+
 #ifdef SLAPD_MODULES
        if ( module_init() != 0 ) {
                slap_debug |= LDAP_DEBUG_NONE;
@@ -112,6 +112,14 @@ slap_init( int mode, const char *name )
                return 1;
        }
 
+       if ( filter_init() != 0 ) {
+               slap_debug |= LDAP_DEBUG_NONE;
+               Debug( LDAP_DEBUG_ANY,
+                   "%s: filter_init failed\n",
+                   name, 0, 0 );
+               return 1;
+       }
+
        if ( entry_init() != 0 ) {
                slap_debug |= LDAP_DEBUG_NONE;
                Debug( LDAP_DEBUG_ANY,
@@ -135,7 +143,6 @@ slap_init( int mode, const char *name )
 
                ldap_pvt_thread_pool_init( &connection_pool,
                                connection_pool_max, 0);
-               ldap_pvt_thread_mutex_init( &replog_mutex );
 
                ldap_pvt_thread_mutex_init( &slap_counters.sc_sent_mutex );
                ldap_pvt_thread_mutex_init( &slap_counters.sc_ops_mutex );
@@ -310,8 +317,10 @@ int slap_destroy(void)
 
        }
 
+       slap_op_destroy();
+
        ldap_pvt_thread_destroy();
 
-       /* should destory the above mutex */
+       /* should destroy the above mutex */
        return rc;
 }