Bug fix for new sockbuf code under NT. Added mutex protection against

[openldap] / servers / slapd / init.c

diff --git a/servers/slapd/init.c b/servers/slapd/init.c
index acbee9ef631c1fd0c82a418dd237ccdf296b353f..c8322cb9ea1f86fcda4f3fc0f6a1c4f45b2d1a70 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -1,4 +1,9 @@
 /* init.c - initialize various things */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
 
 #include "portable.h"
 
@@ -22,8 +27,11 @@ int          ldap_syslog = LDAP_DEBUG_STATS;
 int            ldap_syslog;
 #endif
 
+#ifdef LOG_DEBUG
 int            ldap_syslog_level = LOG_DEBUG;
-char           *default_referral;
+#endif
+
+struct berval **default_referral = NULL;
 int            g_argc;
 char           **g_argv;
 
@@ -40,12 +48,14 @@ ldap_pvt_thread_mutex_t     crypt_mutex;
 #endif
 
 int                            num_conns;
-long                   ops_initiated;
-long                   ops_completed;
-ldap_pvt_thread_mutex_t        ops_mutex;
+long                   num_ops_initiated;
+long                   num_ops_completed;
+ldap_pvt_thread_mutex_t        num_ops_mutex;
 
 long                   num_entries_sent;
+long                   num_refs_sent;
 long                   num_bytes_sent;
+long                   num_pdu_sent;
 ldap_pvt_thread_mutex_t        num_sent_mutex;
 /*
  * these mutexes must be used when calling the entry2str()
@@ -54,16 +64,18 @@ ldap_pvt_thread_mutex_t     num_sent_mutex;
 ldap_pvt_thread_mutex_t        entry2str_mutex;
 ldap_pvt_thread_mutex_t        replog_mutex;
 
-static char* slap_name;
+static const char* slap_name = NULL;
 int slapMode = SLAP_UNDEFINED_MODE;
 
 static ldap_pvt_thread_mutex_t currenttime_mutex;
 
 int
-slap_init( int mode, char *name )
+slap_init( int mode, const char *name )
 {
        int rc;
 
+       assert( mode );
+
        if( slapMode != SLAP_UNDEFINED_MODE ) {
                Debug( LDAP_DEBUG_ANY,
                 "%s init: init called twice (old=%d, new=%d)\n",
@@ -73,18 +85,13 @@ slap_init( int mode, char *name )
 
        slapMode = mode;
 
-       switch ( slapMode ) {
-
+       switch ( slapMode & SLAP_MODE ) {
                case SLAP_SERVER_MODE:
                case SLAP_TOOL_MODE:
-#ifdef SLAPD_BDB2
-               case SLAP_TIMEDSERVER_MODE:
-               case SLAP_TOOLID_MODE:
-#endif
-
                        Debug( LDAP_DEBUG_TRACE,
-                               "%s init: initiated %s.\n",
-                               name, mode == SLAP_TOOL_MODE ? "tool" : "server", 0 );
+                               "%s init: initiated %s.\n",     name,
+                               (mode & SLAP_MODE) == SLAP_TOOL_MODE ? "tool" : "server",
+                               0 );
 
                        slap_name = name;
        
@@ -96,7 +103,7 @@ slap_init( int mode, char *name )
                        ldap_pvt_thread_mutex_init( &currenttime_mutex );
                        ldap_pvt_thread_mutex_init( &entry2str_mutex );
                        ldap_pvt_thread_mutex_init( &replog_mutex );
-                       ldap_pvt_thread_mutex_init( &ops_mutex );
+                       ldap_pvt_thread_mutex_init( &num_ops_mutex );
                        ldap_pvt_thread_mutex_init( &num_sent_mutex );
 
                        ldap_pvt_thread_mutex_init( &gmtime_mutex );
@@ -104,7 +111,7 @@ slap_init( int mode, char *name )
                        ldap_pvt_thread_mutex_init( &crypt_mutex );
 #endif
 
-                       rc = backend_init();
+                       rc = backend_init( );
                        break;
 
                default:
@@ -117,7 +124,7 @@ slap_init( int mode, char *name )
        return rc;
 }
 
-int slap_startup(int dbnum)
+int slap_startup( Backend *be )
 {
        int rc;
 
@@ -125,12 +132,16 @@ int slap_startup(int dbnum)
                "%s startup: initiated.\n",
                slap_name, 0, 0 );
 
-       rc = backend_startup(dbnum);
+       rc = backend_startup( be );
+
+       if( rc == 0 ) {
+               rc = sasl_init();
+       }
 
        return rc;
 }
 
-int slap_shutdown(int dbnum)
+int slap_shutdown( Backend *be )
 {
        int rc;
 
@@ -138,8 +149,10 @@ int slap_shutdown(int dbnum)
                "%s shutdown: initiated\n",
                slap_name, 0, 0 );
 
+       sasl_destroy();
+
        /* let backends do whatever cleanup they need to do */
-       rc = backend_shutdown(dbnum); 
+       rc = backend_shutdown( be ); 
 
        return rc;
 }
@@ -154,6 +167,10 @@ int slap_destroy(void)
 
        rc = backend_destroy();
 
+       entry_destroy();
+
+       ldap_pvt_thread_destroy();
+
        /* should destory the above mutex */
        return rc;
 }