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 b02596f3f4e2dda3866e497f7dc989abad864aa6..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-2017 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) {
@@ -79,6 +78,7 @@ int main(int argc, char **argv)
        int relh=0;
        int home=0;
        int dbg=0;
+       int max_log_level = LOG_INFO;
        char relhome[PATH_MAX]="";
        char ctdldir[PATH_MAX]=CTDLDIR;
        int syslog_facility = LOG_DAEMON;
@@ -86,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 */
@@ -97,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));
@@ -121,7 +117,7 @@ int main(int argc, char **argv)
                        break;
 
                case 'x':
-                               /* deprecated */
+                       max_log_level = atoi(optarg);
                        break;
 
                case 't':       /* deprecated */
@@ -158,11 +154,17 @@ 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: "
                                        "citserver "
                                        "[-l LogFacility] "
+                                       "[-x MaxLogLevel] "
                                        "[-d] [-D] [-r] "
                                        "[-u user] "
                                        "[-h HomeDir]\n"
@@ -193,6 +195,7 @@ int main(int argc, char **argv)
        }
 
        StartLibCitadel(basesize);
+       setlogmask(LOG_UPTO(max_log_level));
        openlog("citserver",
                ( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
                syslog_facility
@@ -210,15 +213,22 @@ 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-2017 by the Citadel development team.");
-       syslog(LOG_INFO, "This program is distributed under the terms of the GNU General Public License.");
+       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.");
+       syslog(LOG_INFO, " ");
+       syslog(LOG_INFO, "This program is distributed in the hope that it will be useful,");
+       syslog(LOG_INFO, "but WITHOUT ANY WARRANTY; without even the implied warranty of");
+       syslog(LOG_INFO, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the");
+       syslog(LOG_INFO, "GNU General Public License for more details.");
        syslog(LOG_INFO, " ");
        syslog(LOG_INFO, "%s", libcitadel_version_string());
 
 #ifdef HAVE_RUN_DIR
        /* on some dists rundir gets purged on startup. so we need to recreate it. */
 
-       if (stat(ctdl_run_dir, &filestats)==-1){
+       if (stat(ctdl_run_dir, &filestats) == -1) {
 #ifdef HAVE_GETPWUID_R
 #ifdef SOLARIS_GETPWUID
                pwp = getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf));
@@ -240,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
  */
@@ -302,9 +298,6 @@ int main(int argc, char **argv)
                                do_async_loop,
                                CitadelServiceTCP);
 
-                               
-       
-       
        /*
         * Load any server-side extensions available here.
         */
@@ -319,13 +312,11 @@ int main(int argc, char **argv)
                start_chkpwd_daemon();
        }
 
-
        /*
         * check, whether we're fired up another time after a crash.
         * if, post an aide message, so the admin has a chance to react.
         */
-       checkcrash ();
-
+       checkcrash();
 
        /*
         * Now that we've bound the sockets, change to the Citadel user id and its
@@ -367,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);
 }