#include <errno.h>
#include <stdarg.h>
#include <grp.h>
+#include <pwd.h>
#ifdef HAVE_PTHREAD_H
#include <pthread.h>
#endif
#include "citserver.h"
#include "support.h"
#include "config.h"
+#include "control.h"
#include "database.h"
+#include "user_ops.h"
#include "housekeeping.h"
#include "tools.h"
+#include "citadel_dirs.c"
+
+#include "modules_init.h"
+#include "ecrash.h"
#ifdef HAVE_SYS_SELECT_H
#include <sys/select.h>
#ifndef HAVE_SNPRINTF
#include "snprintf.h"
#endif
-
-int running_as_daemon = 0;
+const char *CitadelServiceUDS="citadel-UDS";
+const char *CitadelServiceTCP="citadel-TCP";
/*
* Here's where it all begins.
{
char facility[32];
int a, i; /* General-purpose variables */
- struct passwd *pw;
+ struct passwd pw, *pwp = NULL;
+ char pwbuf[SIZ];
int drop_root_perms = 1;
size_t size;
-
+ int relh=0;
+ int home=0;
+ char relhome[PATH_MAX]="";
+ char ctdldir[PATH_MAX]=CTDLDIR;
+#ifdef HAVE_RUN_DIR
+ struct stat filestats;
+#endif
+#ifdef HAVE_BACKTRACE
+ eCrashParameters params;
+// eCrashSymbolTable symbol_table;
+#endif
+ /* initialise semaphores here. Patch by Matt and davew
+ * its called here as they are needed by lprintf for thread safety
+ */
+ InitialiseSemaphores();
+
/* initialize the master context */
InitializeMasterCC();
- /* set default syslog facility */
- syslog_facility = LOG_DAEMON;
-
/* parse command-line arguments */
for (a=1; a<argc; ++a) {
if (!strncmp(argv[a], "-l", 2)) {
- safestrncpy(facility, argv[a], sizeof(facility));
+ safestrncpy(facility, &argv[a][2], 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);
+ 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);
home_specified = 1;
+ home=1;
+ }
+
+ else if (!strncmp(argv[a], "-t", 2)) {
+ freopen(&argv[a][2], "w", stderr);
}
else if (!strncmp(argv[a], "-f", 2)) {
"citserver "
"[-lLogFacility] "
"[-d] [-f]"
+ " [-tTraceFile]"
" [-xLogLevel] [-hHomeDir]\n");
exit(1);
}
}
+ calc_dirs_n_files(relh, home, relhome, ctdldir);
/* 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;
+ }
+
+#ifdef HAVE_BACKTRACE
+ bzero(¶ms, sizeof(params));
+ params.filename = file_pid_paniclog;
+ panic_fd=open(file_pid_paniclog, O_APPEND|O_CREAT|O_DIRECT);
+ params.filep = fopen(file_pid_paniclog, "a+");
+ params.debugLevel = ECRASH_DEBUG_VERBOSE;
+ params.dumpAllThreads = TRUE;
+ params.useBacktraceSymbols = 1;
+/// BuildSymbolTable(&symbol_table);
+// params.symbolTable = &symbol_table;
+ params.signals[0]=SIGSEGV;
+ params.signals[1]=SIGILL;
+ params.signals[2]=SIGBUS;
+ params.signals[3]=SIGABRT;
- /* 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));
+ eCrash_Init(¶ms);
+
+ eCrash_RegisterThread("MasterThread", 0);
+
+/// signal(SIGSEGV, cit_panic_backtrace);
+#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 */
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-2007 by the Citadel development team.\n");
lprintf(CTDL_NOTICE,
"This program is distributed under the terms of the GNU "
"General Public License.\n");
config.c_ipgm_secret = rand();
put_config();
+#ifdef HAVE_RUN_DIR
+ /* on some dists rundir gets purged on startup. so we need to recreate it. */
+
+ if (stat(ctdl_run_dir, &filestats)==-1){
+#ifdef SOLARIS_GETPWUID
+ pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
+#else
+ getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+#endif
+ mkdir(ctdl_run_dir, 0755);
+ chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid);
+ }
+
+
+#endif
+
/* Initialize... */
init_sysdep();
*/
master_startup();
+ lprintf(CTDL_INFO, "Acquiring control record\n");
+ get_control();
+
/*
* Bind the server to a Unix-domain socket.
*/
CtdlRegisterServiceHook(0,
- "citadel.socket",
+ file_citadel_socket,
citproto_begin_session,
do_command_loop,
- do_async_loop);
+ do_async_loop,
+ CitadelServiceUDS);
/*
* Bind the server to our favorite TCP port (usually 504).
NULL,
citproto_begin_session,
do_command_loop,
- do_async_loop);
+ do_async_loop,
+ CitadelServiceTCP);
/*
* 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();
+*/
+
+ initialise_modules();
+
+
+
+ /*
+ * If we need host auth, start our chkpwd daemon.
+ */
+ if (config.c_auth_mode == 1) {
+ start_chkpwd_daemon();
+ }
/*
- * 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)
+ cdb_chmod_data(); /* make sure we own our data files */
+
+#ifdef SOLARIS_GETPWUID
+ pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
+#else
+ getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
+#endif
+ if (pwp == 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);
- if (setgid(pw->pw_gid))
- lprintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw->pw_gid,
+ initgroups(pw.pw_name, pw.pw_gid);
+ if (setgid(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)
/*
* Now create a bunch of worker threads.
*/
- lprintf(CTDL_DEBUG, "Starting %d worker threads\n", config.c_min_workers-1);
+ lprintf(CTDL_DEBUG, "Starting %d worker threads\n",
+ config.c_min_workers-1);
begin_critical_section(S_WORKER_LIST);
for (i=0; i<(config.c_min_workers-1); ++i) {
create_worker();
}
end_critical_section(S_WORKER_LIST);
- /* Now this thread can become a worker as well. */
- worker_thread(NULL);
+ /* Create the maintenance threads. */
+ create_maintenance_threads();
- /* Server is exiting. Wait for workers to shutdown. */
- lprintf(CTDL_INFO, "Server is shutting down.\n");
+ /* This thread is now useless. It can't be turned into a worker
+ * thread because its stack is too small, but it can't be killed
+ * either because the whole server process would exit. So we just
+ * join to the first worker thread and exit when it exits.
+ */
+ pthread_join(worker_list->tid, NULL);
master_cleanup(0);
return(0);
}
projects / citadel.git / blobdiff