Shamlessly slapped a 2020 copyright date on all startup banners.

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 536612ad7bea3f0e8f7559c5202e588737225291..68af7888e9ef221011eb88f6d523d2736d6a6ac6 100644 (file)
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,7 +1,7 @@
 /*
  * citserver's main() function lives here.
  * 
- * Copyright (c) 1987-2018 by the citadel.org team
+ * Copyright (c) 1987-2020 by the citadel.org team
  *
  * This program is open source software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 3.
@@ -28,19 +28,18 @@
 #include "serv_extensions.h"
 #include "citadel_dirs.h"
 #include "user_ops.h"
-#include "ecrash.h"
 
 uid_t ctdluid = 0;
 const char *CitadelServiceUDS="citadel-UDS";
 const char *CitadelServiceTCP="citadel-TCP";
-void go_threading(void);
+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) {
@@ -87,10 +86,6 @@ int main(int argc, char **argv)
        struct passwd *p = NULL;
 #ifdef HAVE_RUN_DIR
        struct stat filestats;
-#endif
-#ifdef HAVE_BACKTRACE
-       eCrashParameters params;
-//     eCrashSymbolTable symbol_table;
 #endif
 
        /* initialize the master context */
@@ -98,7 +93,7 @@ int main(int argc, char **argv)
        InitializeMasterTSD();
 
        /* parse command-line arguments */
-       while ((a=getopt(argc, argv, "l:dh:x:t:B:Dru:")) != EOF) switch(a) {
+       while ((a=getopt(argc, argv, "l:dh:x:t:B:Dru:s:")) != EOF) switch(a) {
 
                case 'l':
                        safestrncpy(facility, optarg, sizeof(facility));
@@ -159,6 +154,11 @@ int main(int argc, char **argv)
                        }
                        break;
 
+               /* -s tells the server to behave differently during sanity checks */
+               case 's':
+                       sanity_diag_mode = atoi(optarg);
+                       break;
+
                default:
                /* any other parameter makes it crash and burn */
                        fprintf(stderr, "citserver: usage: "
@@ -213,7 +213,7 @@ int main(int argc, char **argv)
        syslog(LOG_INFO, " ");
        syslog(LOG_INFO, "*** Citadel server engine ***\n");
        syslog(LOG_INFO, "Version %d (build %s) ***", REV_LEVEL, svn_revision());
-       syslog(LOG_INFO, "Copyright (C) 1987-2018 by the Citadel development team.");
+       syslog(LOG_INFO, "Copyright (C) 1987-2020 by the Citadel development team.");
        syslog(LOG_INFO, " ");
        syslog(LOG_INFO, "This program is open source software: you can redistribute it and/or");
        syslog(LOG_INFO, "modify it under the terms of the GNU General Public License, version 3.");
@@ -250,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 control record, fix user indexes
+       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
  */
@@ -312,9 +298,6 @@ int main(int argc, char **argv)
                                do_async_loop,
                                CitadelServiceTCP);
 
-                               
-       
-       
        /*
         * Load any server-side extensions available here.
         */
@@ -375,5 +358,8 @@ int main(int argc, char **argv)
        
        int exit_code = master_cleanup(exit_signal);
        ctdl_lockfile(0);
+       if (restart_server) {
+               execv(argv[0], argv);
+       }
        return(exit_code);
 }