X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=8e3a8d254d513dbf645a88b8eafc57684c70f8f4;hb=0c90ed3253337bfd864b4d780df4701d0cc0f2c4;hp=8df0f343a249fd01525e917530ddd2530d1f1569;hpb=47585659f82eec5dc6cedc9d6695e03ef34f019e;p=citadel.git

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 8df0f343a..8e3a8d254 100644
--- 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-2019 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.
@@ -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) {
@@ -94,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:s")) != 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));
@@ -155,9 +154,9 @@ int main(int argc, char **argv)
 			}
 			break;
 
-		/* -s tells the server to suppress fixing any discrepancies found during sanity checks, but exit after those checks complete */
+		/* -s tells the server to behave differently during sanity checks */
 		case 's':
-			sanity_diag_mode = 1;
+			sanity_diag_mode = atoi(optarg);
 			break;
 
 		default:
@@ -214,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-2019 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.");
@@ -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 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
  */
@@ -313,9 +298,6 @@ int main(int argc, char **argv)
 				do_async_loop,
 				CitadelServiceTCP);
 
-				
-	
-	
 	/*
 	 * Load any server-side extensions available here.
 	 */
@@ -376,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);
 }