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 510816798af8ee3491da3c4eb3a6b582ae0a265d..c8322cb9ea1f86fcda4f3fc0f6a1c4f45b2d1a70 100644 (file)
--- a/servers/slapd/init.c
+++ b/servers/slapd/init.c
@@ -1,7 +1,7 @@
 /* init.c - initialize various things */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -64,13 +64,13 @@ 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 = NULL;
+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;
 
@@ -89,8 +89,9 @@ slap_init( int mode, char *name )
                case SLAP_SERVER_MODE:
                case SLAP_TOOL_MODE:
                        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;