X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=592ea7708bbc620f518e10eb21af59406b86642d;hb=a793d2fbf5e0aa9151490b76defd22f6db7ef7ed;hp=5d73d7a523ceb3899839e031bafb80e8c653365f;hpb=1421d26887f154439d2cd27075c7e85dc22f644f;p=citadel.git

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 5d73d7a52..592ea7708 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -1,7 +1,15 @@
 /*
  * citserver's main() function lives here.
+ * 
+ * Copyright (c) 1987-2012 by the citadel.org team
  *
- * $Id$
+ * 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.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  */
 
 #include "sysdep.h"
@@ -86,12 +94,12 @@ int main(int argc, char **argv)
 	struct passwd pw, *pwp = NULL;
 	char pwbuf[SIZ];
 	int drop_root_perms = 1;
-	size_t size;
 	int relh=0;
 	int home=0;
 	int dbg=0;
 	char relhome[PATH_MAX]="";
 	char ctdldir[PATH_MAX]=CTDLDIR;
+	int syslog_facility = LOG_DAEMON;
 #ifdef HAVE_RUN_DIR
 	struct stat filestats;
 #endif
@@ -99,13 +107,10 @@ int main(int argc, char **argv)
 	eCrashParameters params;
 //	eCrashSymbolTable symbol_table;
 #endif
-	/* initialise semaphores here. Patch by Matt and davew
-	 * its called here as they are needed by CtdlLogPrintf for thread safety
-	 */
-	InitialiseSemaphores();
-	
+
 	/* initialize the master context */
 	InitializeMasterCC();
+	InitializeMasterTSD();
 
 	/* parse command-line arguments */
 	for (a=1; a<argc; ++a) {
@@ -113,7 +118,6 @@ int main(int argc, char **argv)
 		if (!strncmp(argv[a], "-l", 2)) {
 			safestrncpy(facility, &argv[a][2], sizeof(facility));
 			syslog_facility = SyslogFacility(facility);
-			enable_syslog = 1;
 		}
 
 		/* run in the background if -d was specified */
@@ -121,23 +125,23 @@ int main(int argc, char **argv)
 			running_as_daemon = 1;
 		}
 
-		/* -x specifies the desired logging level */
-		else if (!strncmp(argv[a], "-x", 2)) {
-			verbosity = atoi(&argv[a][2]);
-		}
-
 		else if (!strncmp(argv[a], "-h", 2)) {
 			relh=argv[a][2]!='/';
-			if (!relh) safestrncpy(ctdl_home_directory, &argv[a][2],
-								   sizeof ctdl_home_directory);
-			else
-				safestrncpy(relhome, &argv[a][2],
-							sizeof relhome);
+			if (!relh) {
+				safestrncpy(ctdl_home_directory, &argv[a][2], sizeof ctdl_home_directory);
+			}
+			else {
+				safestrncpy(relhome, &argv[a][2], sizeof relhome);
+			}
 			home=1;
 		}
 
+		else if (!strncmp(argv[a], "-x", 2)) {
+			/* deprecated */
+		}
+
 		else if (!strncmp(argv[a], "-t", 2)) {
-			freopen(&argv[a][2], "w", stderr);
+			/* deprecated */
 		}
 
 		else if (!strncmp(argv[a], "-D", 2)) {
@@ -147,22 +151,28 @@ int main(int argc, char **argv)
 		/* -r tells the server not to drop root permissions. don't use
 		 * this unless you know what you're doing. this should be
 		 * removed in the next release if it proves unnecessary. */
-		else if (!strcmp(argv[a], "-r"))
+		else if (!strcmp(argv[a], "-r")) {
 			drop_root_perms = 0;
+		}
 
 		/* any other parameter makes it crash and burn */
 		else {
-			CtdlLogPrintf(CTDL_EMERG,	"citserver: usage: "
+			fprintf(stderr,	"citserver: usage: "
 					"citserver "
 					"[-lLogFacility] "
-					"[-d] [-D] "
-					" [-tTraceFile]"
-					" [-xLogLevel] [-hHomeDir]\n");
+					"[-d] [-D] [-s] "
+					"[-hHomeDir]\n"
+			);
 			exit(1);
 		}
 
 	}
 
+	openlog("citserver",
+		( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
+		syslog_facility
+	);
+
 	calc_dirs_n_files(relh, home, relhome, ctdldir, dbg);
 	/* daemonize, if we were asked to */
 	if (running_as_daemon) {
@@ -186,36 +196,26 @@ int main(int argc, char **argv)
 	eCrash_RegisterThread("MasterThread", 0);
 #endif
 
-	/* Initialize the syslogger.  Yes, we are really using 0 as the
-	 * facility, because we are going to bitwise-OR the facility to
-	 * the severity of each message, allowing us to write to other
-	 * facilities when we need to...
-	 */
-	if (enable_syslog) {
-		openlog("citadel", LOG_NDELAY, 0);
-		setlogmask(LOG_UPTO(verbosity));
-	}
-	
 	/* Tell 'em who's in da house */
-	CtdlLogPrintf(CTDL_NOTICE, "\n");
-	CtdlLogPrintf(CTDL_NOTICE, "\n");
-	CtdlLogPrintf(CTDL_NOTICE,
-		"*** Citadel server engine v%d.%02d (build %s) ***\n",
+	syslog(LOG_NOTICE, " ");
+	syslog(LOG_NOTICE, " ");
+	syslog(LOG_NOTICE,
+		"*** Citadel server engine v%d.%02d (build %s) ***",
 		(REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
-	CtdlLogPrintf(CTDL_NOTICE, "Copyright (C) 1987-2008 by the Citadel development team.\n");
-	CtdlLogPrintf(CTDL_NOTICE, "This program is distributed under the terms of the GNU "
-					"General Public License.\n");
-	CtdlLogPrintf(CTDL_NOTICE, "\n");
-	CtdlLogPrintf(CTDL_DEBUG, "Called as: %s\n", argv[0]);
-	CtdlLogPrintf(CTDL_INFO, "%s\n", libcitadel_version_string());
+	syslog(LOG_NOTICE, "Copyright (C) 1987-2012 by the Citadel development team.");
+	syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
+					"General Public License.");
+	syslog(LOG_NOTICE, " ");
+	syslog(LOG_DEBUG, "Called as: %s", argv[0]);
+	syslog(LOG_INFO, "%s", libcitadel_version_string());
 
 	/* Load site-specific parameters, and set the ipgm secret */
-	CtdlLogPrintf(CTDL_INFO, "Loading citadel.config\n");
+	syslog(LOG_INFO, "Loading citadel.config");
 	get_config();
 	config.c_ipgm_secret = rand();
 
 	/* get_control() MUST MUST MUST be called BEFORE the databases are opened!! */
-	CtdlLogPrintf(CTDL_INFO, "Acquiring control record\n");
+	syslog(LOG_INFO, "Acquiring control record");
 	get_control();
 
 	put_config();
@@ -233,8 +233,16 @@ int main(int argc, char **argv)
 #else // HAVE_GETPWUID_R
 		pwp = NULL;
 #endif // HAVE_GETPWUID_R
-		mkdir(ctdl_run_dir, 0755);
-		chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid);
+
+		if ((mkdir(ctdl_run_dir, 0755) != 0) && (errno != EEXIST))
+			syslog(LOG_EMERG, 
+				      "unable to create run directory [%s]: %s", 
+				      ctdl_run_dir, strerror(errno));
+
+		if (chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid) != 0)
+			syslog(LOG_EMERG, 
+				      "unable to set the access rights for [%s]: %s", 
+				      ctdl_run_dir, strerror(errno));
 	}
 			
 
@@ -256,18 +264,18 @@ int main(int argc, char **argv)
 	/*
 	 * Run any upgrade entry points
 	 */
-	CtdlLogPrintf(CTDL_INFO, "Upgrading modules.\n");
+	syslog(LOG_INFO, "Upgrading modules.");
 	upgrade_modules();
 	
-/**
+/*
  * Load the user for the masterCC or create them if they don't exist
  */
 	if (CtdlGetUser(&masterCC.user, "SYS_Citadel"))
 	{
-		/** User doesn't exist. We can't use create user here as the user number needs to be 0 */
+		/* User doesn't exist. We can't use create user here as the user number needs to be 0 */
 		strcpy (masterCC.user.fullname, "SYS_Citadel") ;
 		CtdlPutUser(&masterCC.user);
-		CtdlGetUser(&masterCC.user, "SYS_Citadel"); /** Just to be safe */
+		CtdlGetUser(&masterCC.user, "SYS_Citadel"); /* Just to be safe */
 	}
 	
 	/*
@@ -296,12 +304,9 @@ int main(int argc, char **argv)
 	/*
 	 * Load any server-side extensions available here.
 	 */
-	CtdlLogPrintf(CTDL_INFO, "Initializing server extensions\n");
-	size = strlen(ctdl_home_directory) + 9;
+	syslog(LOG_INFO, "Initializing server extensions");
 	
 	initialise_modules(0);
-	
-	
 
 	/*
 	 * If we need host auth, start our chkpwd daemon.
@@ -336,18 +341,18 @@ int main(int argc, char **argv)
 #endif // HAVE_GETPWUID_R
 
 		if (pwp == NULL)
-			CtdlLogPrintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
+			syslog(LOG_CRIT, "WARNING: getpwuid(%ld): %s"
 				   "Group IDs will be incorrect.\n", (long)CTDLUID,
 				strerror(errno));
 		else {
 			initgroups(pw.pw_name, pw.pw_gid);
 			if (setgid(pw.pw_gid))
-				CtdlLogPrintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw.pw_gid,
+				syslog(LOG_CRIT, "setgid(%ld): %s", (long)pw.pw_gid,
 					strerror(errno));
 		}
-		CtdlLogPrintf(CTDL_INFO, "Changing uid to %ld\n", (long)CTDLUID);
+		syslog(LOG_INFO, "Changing uid to %ld", (long)CTDLUID);
 		if (setuid(CTDLUID) != 0) {
-			CtdlLogPrintf(CTDL_CRIT, "setuid() failed: %s\n", strerror(errno));
+			syslog(LOG_CRIT, "setuid() failed: %s", strerror(errno));
 		}
 #if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)
 		prctl(PR_SET_DUMPABLE, 1);
@@ -359,7 +364,6 @@ int main(int argc, char **argv)
 
 	go_threading();
 	
-	
 	master_cleanup(exit_signal);
 	return(0);
 }