X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=b08d070f32cf3836e56832db7edbc561a23ca03a;hb=a69148ba680b403a3f07310e037210de606c4a51;hp=3e94a8ab124fa6e66d38fb3f37bd58434f1105c9;hpb=7395c7c662ad7e40a99aef8937e8f90d9e9a729a;p=citadel.git

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 3e94a8ab1..b08d070f3 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-2021 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,18 +93,26 @@ 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, "cl:dh:x:t:B:Dru:s:")) != EOF) switch(a) {
 
+		// test this binary for compatibility and exit
+		case 'c':
+			fprintf(stderr, "%s: binary compatibility confirmed\n", argv[0]);
+			exit(0);
+			break;
+
+		// identify the desired syslog facility
 		case 'l':
 			safestrncpy(facility, optarg, sizeof(facility));
 			syslog_facility = SyslogFacility(facility);
 			break;
 
-		/* run in the background if -d was specified */
+		// run in the background if -d was specified
 		case 'd':
 			running_as_daemon = 1;
 			break;
 
+		// specify the data directory
 		case 'h':
 			relh = optarg[0] != '/';
 			if (!relh) {
@@ -117,13 +124,17 @@ int main(int argc, char **argv)
 			home=1;
 			break;
 
+		// identify the desired logging severity level
 		case 'x':
 			max_log_level = atoi(optarg);
 			break;
 
-		case 't':	/* deprecated */
+		// deprecated
+		case 't':
 			break;
-                case 'B': /* Basesize */
+
+		// basesize (what is this?)
+                case 'B':
                         basesize = atoi(optarg);
                         break;
 
@@ -131,14 +142,13 @@ int main(int argc, char **argv)
 			dbg = 1;
 			break;
 
-		/* -r tells the server not to drop root permissions.
-		 * Don't use this unless you know what you're doing.
-		 */
+		// -r tells the server not to drop root permissions.
+		// Don't use this unless you know what you're doing.
 		case 'r':
 			drop_root_perms = 0;
 			break;
 
-		/* -u tells the server what uid to run under... */
+		// -u tells the server what uid to run under...
 		case 'u':
 			u = atoi(optarg);
 			if (u > 0) {
@@ -155,13 +165,13 @@ int main(int argc, char **argv)
 			}
 			break;
 
-		/* -s tells the server to behave differently during sanity checks */
+		// -s tells the server to behave differently during sanity checks
 		case 's':
 			sanity_diag_mode = atoi(optarg);
 			break;
 
+		// any other parameter makes it crash and burn
 		default:
-		/* any other parameter makes it crash and burn */
 			fprintf(stderr,	"citserver: usage: "
 					"citserver "
 					"[-l LogFacility] "
@@ -214,7 +224,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-2021 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 +261,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 +309,6 @@ int main(int argc, char **argv)
 				do_async_loop,
 				CitadelServiceTCP);
 
-				
-	
-	
 	/*
 	 * Load any server-side extensions available here.
 	 */
@@ -376,5 +369,9 @@ int main(int argc, char **argv)
 	
 	int exit_code = master_cleanup(exit_signal);
 	ctdl_lockfile(0);
+	if (restart_server) {
+		syslog(LOG_INFO, "main:    *** CITADEL SERVER IS RESTARTING ***");
+		execv(argv[0], argv);
+	}
 	return(exit_code);
 }