X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=68af7888e9ef221011eb88f6d523d2736d6a6ac6;hb=6d051cee6f669b6ecd950e933a95644f3cf097ea;hp=f24a69edcc55dc91bea02a9aadad455ce88cd972;hpb=b8e3b4626c7729dc2faad82c54ab42d061ec64a3;p=citadel.git

diff --git a/citadel/server_main.c b/citadel/server_main.c
index f24a69edc..68af7888e 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-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.
@@ -32,14 +32,14 @@
 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) {
@@ -93,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));
@@ -154,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: "
@@ -208,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.");
@@ -245,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
  */
@@ -307,9 +298,6 @@ int main(int argc, char **argv)
 				do_async_loop,
 				CitadelServiceTCP);
 
-				
-	
-	
 	/*
 	 * Load any server-side extensions available here.
 	 */
@@ -370,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);
 }