/*
* citserver's main() function lives here.
*
- * Copyright (c) 1987-2011 by the citadel.org team
+ * Copyright (c) 1987-2012 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 as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * 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.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
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;
// eCrashSymbolTable symbol_table;
#endif
-#ifdef HAVE_GC
- GC_INIT();
- GC_find_leak = 1;
-#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) {
running_as_daemon = 1;
}
- /* run a few stats if -s was specified */
- else if (!strncmp(argv[a], "-s", 2)) {
- statcount = 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], "-t", 2)) {
- if (freopen(&argv[a][2], "w", stderr) != stderr)
- {
- syslog(LOG_EMERG,
- "unable to open your trace log [%s]: %s",
- &argv[a][2],
- strerror(errno));
- exit(1);
- }
- have_log = 1;
+ /* deprecated */
}
else if (!strncmp(argv[a], "-D", 2)) {
/* -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 {
"citserver "
"[-lLogFacility] "
"[-d] [-D] [-s] "
- "[-tTraceFile] "
"[-hHomeDir]\n"
);
exit(1);
#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-2012 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();
/*
* 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 */
}
/*
/*
* Load any server-side extensions available here.
*/
- syslog(LOG_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.
#endif // HAVE_GETPWUID_R
if (pwp == NULL)
- syslog(LOG_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))
- syslog(LOG_CRIT, "setgid(%ld): %s\n", (long)pw.pw_gid,
+ syslog(LOG_CRIT, "setgid(%ld): %s", (long)pw.pw_gid,
strerror(errno));
}
- syslog(LOG_INFO, "Changing uid to %ld\n", (long)CTDLUID);
+ syslog(LOG_INFO, "Changing uid to %ld", (long)CTDLUID);
if (setuid(CTDLUID) != 0) {
- syslog(LOG_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);
go_threading();
-
master_cleanup(exit_signal);
return(0);
}
projects / citadel.git / blobdiff