struct passwd *pw;
int drop_root_perms = 1;
size_t size;
-
+
/* initialize the master context */
InitializeMasterCC();
if (!strncmp(argv[a], "-l", 2)) {
safestrncpy(facility, argv[a], sizeof(facility));
syslog_facility = SyslogFacility(facility);
+ enable_syslog = 1;
}
/* run in the background if -d was specified */
}
else if (!strncmp(argv[a], "-h", 2)) {
- safestrncpy(bbs_home_directory, &argv[a][2],
- sizeof bbs_home_directory);
+ safestrncpy(ctdl_home_directory, &argv[a][2],
+ sizeof ctdl_home_directory);
home_specified = 1;
}
+ else if (!strncmp(argv[a], "-t", 2)) {
+ freopen(&argv[a][2], "w", stderr);
+ }
+
else if (!strncmp(argv[a], "-f", 2)) {
do_defrag = 1;
}
"citserver "
"[-lLogFacility] "
"[-d] [-f]"
+ " [-tTraceFile]"
" [-xLogLevel] [-hHomeDir]\n");
exit(1);
}
}
/* daemonize, if we were asked to */
- if (running_as_daemon) { start_daemon(0); drop_root_perms = 1; }
+ if (running_as_daemon) {
+ start_daemon(0);
+ drop_root_perms = 1;
+ }
/* initialize the syslog facility */
- if (running_as_daemon) openlog("Citadel", LOG_NDELAY, syslog_facility);
- else openlog("Citadel", LOG_PERROR|LOG_NDELAY, syslog_facility);
- setlogmask(LOG_UPTO(verbosity));
+ if (enable_syslog) {
+ if (running_as_daemon) {
+ openlog("citadel", LOG_NDELAY, syslog_facility);
+ }
+ else {
+ openlog("citadel", LOG_PERROR|LOG_NDELAY,
+ syslog_facility);
+ }
+ setlogmask(LOG_UPTO(verbosity));
+ }
/* Tell 'em who's in da house */
lprintf(CTDL_NOTICE, "\n");
"*** Citadel server engine v%d.%02d ***\n",
(REV_LEVEL/100), (REV_LEVEL%100));
lprintf(CTDL_NOTICE,
- "Copyright (C) 1987-2004 by the Citadel development team.\n");
+ "Copyright (C) 1987-2005 by the Citadel development team.\n");
lprintf(CTDL_NOTICE,
"This program is distributed under the terms of the GNU "
"General Public License.\n");
lprintf(CTDL_NOTICE, "\n");
+ lprintf(CTDL_DEBUG, "Called as: %s\n", argv[0]);
/* Load site-specific parameters, and set the ipgm secret */
lprintf(CTDL_INFO, "Loading citadel.config\n");
* Load any server-side extensions available here.
*/
lprintf(CTDL_INFO, "Initializing server extensions\n");
- size = strlen(bbs_home_directory) + 9;
+ size = strlen(ctdl_home_directory) + 9;
initialize_server_extensions();
/*
- * Now that we've bound the sockets, change to the BBS user id and its
+ * Now that we've bound the sockets, change to the Citadel user id and its
* corresponding group ids
*/
if (drop_root_perms) {
- if ((pw = getpwuid(BBSUID)) == NULL)
+ if ((pw = getpwuid(CTDLUID)) == NULL)
lprintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
- "Group IDs will be incorrect.\n", (long)BBSUID,
+ "Group IDs will be incorrect.\n", (long)CTDLUID,
strerror(errno));
else {
initgroups(pw->pw_name, pw->pw_gid);
lprintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw->pw_gid,
strerror(errno));
}
- lprintf(CTDL_INFO, "Changing uid to %ld\n", (long)BBSUID);
- if (setuid(BBSUID) != 0) {
+ lprintf(CTDL_INFO, "Changing uid to %ld\n", (long)CTDLUID);
+ if (setuid(CTDLUID) != 0) {
lprintf(CTDL_CRIT, "setuid() failed: %s\n", strerror(errno));
}
#if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)
}
end_critical_section(S_WORKER_LIST);
+ /* Create the indexer thread. */
+ create_indexer_thread();
+
/* Now this thread can become a worker as well. */
worker_thread(NULL);
/* Server is exiting. Wait for workers to shutdown. */
lprintf(CTDL_INFO, "Server is shutting down.\n");
- master_cleanup();
+ master_cleanup(0);
return(0);
}