Patches from Matt with slight mod from me to do without strlen. Also modified lprintf...

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 2d2309b09407bec9213a19b973a0376bdba84f40..4c69e608342f9c9c3af4aa9cdc653f77f279b3fa 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -69,8 +69,6 @@
 #include "snprintf.h"
 #endif
 
-int running_as_daemon = 0;
-
 /*
  * Here's where it all begins.
  */
@@ -89,6 +87,11 @@ int main(int argc, char **argv)
 #ifdef HAVE_RUN_DIR
        struct stat filestats;
 #endif
+
+       /* initialise semaphores here. Patch by Matt and davew
+        * its called here as they are needed by lprintf for thread safety
+        */
+       InitialiseSemaphores();
        
        /* initialize the master context */
        InitializeMasterCC();
@@ -299,7 +302,7 @@ int main(int argc, char **argv)
        }
        end_critical_section(S_WORKER_LIST);
 
-       /* Create the indexer thread. */
+       /* Create the maintenance threads. */
        create_maintenance_threads();
 
        /* This thread is now useless.  It can't be turned into a worker