X-Git-Url: https://code.citadel.org/?p=citadel.git;a=blobdiff_plain;f=webcit-ng%2Fmain.c;h=9e2483cc4ab373ae1b5e6c40c07fc9dcd35d8c4e;hp=4270d3c5d3151ef7a7209bab9e95108ba7cd02d1;hb=1e05f422343597adb7b3a6b32f6c538ffbff8314;hpb=52b6f96d74b3faf7e25f87618493c1ffd8cc3571

diff --git a/webcit-ng/main.c b/webcit-ng/main.c
index 4270d3c5d..9e2483cc4 100644
--- a/webcit-ng/main.c
+++ b/webcit-ng/main.c
@@ -1,7 +1,7 @@
 /*
  * Main entry point for the program.
  *
- * Copyright (c) 1996-2018 by the citadel.org team
+ * Copyright (c) 1996-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.
@@ -30,7 +30,8 @@ int main(int argc, char **argv)
 	char *pid_file = NULL;
 
 	/* Parse command line */
-	while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfsS:Z:v:")) != EOF) switch(a) {
+	while ((a = getopt(argc, argv, "u:h:i:p:t:T:B:x:g:dD:G:cfsS:Z:v:")) != EOF)
+		switch (a) {
 		case 'u':
 			setuid(atoi(optarg));
 			break;
@@ -88,11 +89,9 @@ int main(int argc, char **argv)
 				"[-d] [-Z] [-G i18ndumpfile] "
 				"[-u uid] [-h homedirectory] "
 				"[-D daemonizepid] [-v] "
-				"[-g defaultlandingpage] [-B basesize] "
-				"[-s] [-S cipher_suites]"
-				"[remotehost [remoteport]]\n");
+				"[-g defaultlandingpage] [-B basesize] " "[-s] [-S cipher_suites]" "[remotehost [remoteport]]\n");
 			return 1;
-	}
+		}
 
 	if (optind < argc) {
 		ctdlhost = argv[optind];
@@ -101,11 +100,11 @@ int main(int argc, char **argv)
 	}
 
 	/* Start the logger */
-	openlog("webcit", ( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ), LOG_DAEMON);
+	openlog("webcit", (running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR)), LOG_DAEMON);
 
 	/* Tell 'em who's in da house */
 	syslog(LOG_NOTICE, "MAKE WEBCIT GREAT AGAIN!");
-	syslog(LOG_NOTICE, "Copyright (C) 1996-2018 by the citadel.org team");
+	syslog(LOG_NOTICE, "Copyright (C) 1996-2019 by the citadel.org team");
 	syslog(LOG_NOTICE, " ");
 	syslog(LOG_NOTICE, "This program is open source software: you can redistribute it and/or");
 	syslog(LOG_NOTICE, "modify it under the terms of the GNU General Public License, version 3.");
@@ -118,14 +117,14 @@ int main(int argc, char **argv)
 
 	/* Ensure that we are linked to the correct version of libcitadel */
 	if (libcitadel_version_number() < LIBCITADEL_VERSION_NUMBER) {
-		syslog(LOG_INFO, " You are running libcitadel version %d", libcitadel_version_number() );
-		syslog(LOG_INFO, "WebCit was compiled against version %d", LIBCITADEL_VERSION_NUMBER );
-		return(1);
+		syslog(LOG_INFO, " You are running libcitadel version %d", libcitadel_version_number());
+		syslog(LOG_INFO, "WebCit was compiled against version %d", LIBCITADEL_VERSION_NUMBER);
+		return (1);
 	}
 
 	/* Go into the background if we were asked to run as a daemon */
 	if (running_as_daemon) {
-		daemon(0, 0);
+		daemon(1, 0);
 		if (pid_file != NULL) {
 			FILE *pfp = fopen(pid_file, "w");
 			if (pfp) {