X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=55ec9f578ee07e6f9923d394b23592861dfcbe06;hb=200b7ef90a77a4fd2f7239de7d393d2f577233a4;hp=cc45704669cc60f80dafb8300bb0c5e57b007ff6;hpb=7716f155f4145d83b6acfe6157599e6a9ee04608;p=citadel.git

diff --git a/citadel/server_main.c b/citadel/server_main.c
index cc4570466..55ec9f578 100644
--- a/citadel/server_main.c
+++ b/citadel/server_main.c
@@ -100,11 +100,9 @@ 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;
-	int have_log=0;
 	char relhome[PATH_MAX]="";
 	char ctdldir[PATH_MAX]=CTDLDIR;
 	int syslog_facility = LOG_DAEMON;
@@ -116,13 +114,9 @@ int main(int argc, char **argv)
 //	eCrashSymbolTable symbol_table;
 #endif
 
-	/* initialise semaphores here. Patch by Matt and davew
-	 * its called here as they are needed by syslog for thread safety
-	 */
-	InitialiseSemaphores();
-	
 	/* initialize the master context */
 	InitializeMasterCC();
+	InitializeMasterTSD();
 
 	/* parse command-line arguments */
 	for (a=1; a<argc; ++a) {
@@ -160,7 +154,6 @@ int main(int argc, char **argv)
 					      strerror(errno));
 				exit(1);
 			}
-			have_log = 1;
 		}
 
 		else if (!strncmp(argv[a], "-D", 2)) {
@@ -216,25 +209,25 @@ int main(int argc, char **argv)
 #endif
 
 	/* Tell 'em who's in da house */
-	syslog(LOG_NOTICE, "\n");
-	syslog(LOG_NOTICE, "\n");
+	syslog(LOG_NOTICE, " ");
+	syslog(LOG_NOTICE, " ");
 	syslog(LOG_NOTICE,
-		"*** Citadel server engine v%d.%02d (build %s) ***\n",
+		"*** Citadel server engine v%d.%02d (build %s) ***",
 		(REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
-	syslog(LOG_NOTICE, "Copyright (C) 1987-2010 by the Citadel development team.\n");
+	syslog(LOG_NOTICE, "Copyright (C) 1987-2011 by the Citadel development team.");
 	syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
-					"General Public License.\n");
-	syslog(LOG_NOTICE, "\n");
-	syslog(LOG_DEBUG, "Called as: %s\n", argv[0]);
-	syslog(LOG_INFO, "%s\n", libcitadel_version_string());
+					"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 */
-	syslog(LOG_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!! */
-	syslog(LOG_INFO, "Acquiring control record\n");
+	syslog(LOG_INFO, "Acquiring control record");
 	get_control();
 
 	put_config();
@@ -283,18 +276,18 @@ int main(int argc, char **argv)
 	/*
 	 * Run any upgrade entry points
 	 */
-	syslog(LOG_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 */
 	}
 	
 	/*
@@ -324,11 +317,8 @@ int main(int argc, char **argv)
 	 * Load any server-side extensions available here.
 	 */
 	syslog(LOG_INFO, "Initializing server extensions\n");
-	size = strlen(ctdl_home_directory) + 9;
 	
 	initialise_modules(0);
-	
-	
 
 	/*
 	 * If we need host auth, start our chkpwd daemon.