Don't leak logfiles

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index a69cefe73ce73c6e7b9541a0b0fc6aebee92f749..28f30521c6913a6eec4709a5538f39a5f9461421 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -65,14 +65,10 @@ struct berval NoAttrs = BER_BVC( LDAP_NO_ATTRS );
 ldap_pvt_thread_pool_t connection_pool;
 int                    connection_pool_max = SLAP_MAX_WORKER_THREADS;
 int            slap_tool_thread_max = 1;
-#ifndef HAVE_GMTIME_R
 ldap_pvt_thread_mutex_t        gmtime_mutex;
-#endif
 
 slap_counters_t                        slap_counters;
 
-ldap_pvt_thread_mutex_t        replog_mutex;
-
 static const char* slap_name = NULL;
 int slapMode = SLAP_UNDEFINED_MODE;
 
@@ -96,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;
@@ -114,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,
@@ -124,6 +130,7 @@ slap_init( int mode, const char *name )
 
        switch ( slapMode & SLAP_MODE ) {
        case SLAP_SERVER_MODE:
+               root_dse_init();
 
                /* FALLTHRU */
        case SLAP_TOOL_MODE:
@@ -136,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 );
@@ -159,9 +165,7 @@ slap_init( int mode, const char *name )
                }
 #endif /* SLAPD_MONITOR */
 
-#ifndef HAVE_GMTIME_R
                ldap_pvt_thread_mutex_init( &gmtime_mutex );
-#endif
                slap_passwd_init();
 
                rc = slap_sasl_init();
@@ -169,6 +173,8 @@ slap_init( int mode, const char *name )
                if( rc == 0 ) {
                        rc = backend_init( );
                }
+               if ( rc )
+                       return rc;
 
                break;
 
@@ -268,14 +274,21 @@ int slap_destroy(void)
                ber_bvarray_free( default_referral );
        }
 
+       /* clear out any thread-keys for the main thread */
+       ldap_pvt_thread_pool_context_reset( ldap_pvt_thread_pool_context());
+
        rc = backend_destroy();
 
        slap_sasl_destroy();
 
+       /* rootdse destroy goes before entry_destroy()
+        * because it may use entry_free() */
+       root_dse_destroy();
        entry_destroy();
 
        switch ( slapMode & SLAP_MODE ) {
        case SLAP_SERVER_MODE:
+
        case SLAP_TOOL_MODE:
 
                ldap_pvt_thread_mutex_destroy( &slap_counters.sc_sent_mutex );
@@ -304,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;
 }