Initialize TSD key earlier in the startup process. Newer Linux/Linux distributions...

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 10e366051bba31ac3e41c8d39d6f504112378752..8c4f6374184ef380a508810eebe3d4bb934b2704 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -32,7 +32,6 @@
 uid_t ctdluid = 0;
 const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
-void go_threading(void);
 int sanity_diag_mode = 0;
 
 
@@ -40,7 +39,7 @@ int sanity_diag_mode = 0;
  * Create or remove a lock file, so we only have one Citadel Server running at a time.
  */
 void ctdl_lockfile(int yo) {
-       static char lockfilename[SIZ];
+       static char lockfilename[PATH_MAX];
        static FILE *fp;
 
        if (yo) {
@@ -251,26 +250,12 @@ int main(int argc, char **argv)
 #endif
 
        ctdl_lockfile(1);
-
-       /* Initialize... */
-       init_sysdep();
-
-       /*
-        * Do non system dependent startup functions.
-        */
-       master_startup();
-
-       /*
-        * Check that the control record is correct and place sensible values if it isn't
-        */
-       check_control();
-       
-       /*
-        * Run any upgrade entry points
-        */
-       syslog(LOG_INFO, "main: upgrading modules");
+       init_sysdep();                                          // Initialize...
+       master_startup();                                       // Do non system dependent startup functions
+       check_control();                                        // Check, sanitize, initialize the control record
+       syslog(LOG_INFO, "main: upgrading modules");            // Run any upgrade entry points
        upgrade_modules();
-       
+
 /*
  * Load the user for the masterCC or create them if they don't exist
  */
@@ -313,9 +298,6 @@ int main(int argc, char **argv)
                                do_async_loop,
                                CitadelServiceTCP);
 
-                               
-       
-       
        /*
         * Load any server-side extensions available here.
         */