#include "snprintf.h"
#endif
+int running_as_daemon = 0;
+
/*
* Here's where it all begins.
*/
int main(int argc, char **argv)
{
- char tracefile[128]; /* Name of file to log traces to */
+ char facility[32];
int a, i; /* General-purpose variables */
struct passwd *pw;
int drop_root_perms = 1;
size_t size;
-
- /* specify default port name and trace file */
- strcpy(tracefile, "");
-
+ int relh=0;
+ int home=0;
+ const char* basedir;
+ char dirbuffer[PATH_MAX]="";
+ char relhome[PATH_MAX]="";
+ char ctdldir[PATH_MAX]=CTDLDIR;
+
/* initialize the master context */
InitializeMasterCC();
/* parse command-line arguments */
for (a=1; a<argc; ++a) {
- /* -t specifies where to log trace messages to */
- if (!strncmp(argv[a], "-t", 2)) {
- safestrncpy(tracefile, argv[a], sizeof tracefile);
- strcpy(tracefile, &tracefile[2]);
- freopen(tracefile, "r", stdin);
- freopen(tracefile, "w", stdout);
- freopen(tracefile, "w", stderr);
- chmod(tracefile, 0600);
- }
-
- else if (!strncmp(argv[a], "-l", 2)) {
- safestrncpy(tracefile, argv[a], sizeof tracefile);
- strcpy(tracefile, &tracefile[2]);
- syslog_facility = SyslogFacility(tracefile);
- if (syslog_facility >= 0) {
- openlog("citadel", LOG_PID, syslog_facility);
- }
+ 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 */
else if (!strcmp(argv[a], "-d")) {
- start_daemon( (strlen(tracefile) > 0) ? 0 : 1 ) ;
+ running_as_daemon = 1;
}
/* -x specifies the desired logging level */
}
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)) {
/* any other parameter makes it crash and burn */
else {
lprintf(CTDL_EMERG, "citserver: usage: "
- "citserver [-tTraceFile] "
+ "citserver "
"[-lLogFacility] "
"[-d] [-f]"
+ " [-tTraceFile]"
" [-xLogLevel] [-hHomeDir]\n");
exit(1);
}
}
+ /* calculate all our path on a central place */
+ /* where to keep our config */
+
+#define COMPUTE_DIRECTORY(SUBDIR) memcpy(dirbuffer,SUBDIR, sizeof dirbuffer);\
+ snprintf(SUBDIR,sizeof SUBDIR, "%s%s%s%s%s%s%s", \
+ (home&!relh)?ctdl_home_directory:basedir, \
+ ((basedir!=ctdldir)&(home&!relh))?basedir:"/", \
+ ((basedir!=ctdldir)&(home&!relh))?"/":"", \
+ relhome, \
+ (relhome[0]!='\0')?"/":"",\
+ dirbuffer,\
+ (dirbuffer[0]!='\0')?"/":"");
+
+#ifndef HAVE_ETC_DIR
+ basedir=ctdldir;
+#else
+ basedir=ETC_DIR;
+#endif
+ COMPUTE_DIRECTORY(ctdl_etc_dir);
+
+#ifndef HAVE_RUN_DIR
+ basedir=ctdldir;
+#else
+ basedir=RUN_DIR;
+#endif
+ COMPUTE_DIRECTORY(ctdl_run_dir);
+
+#ifndef HAVE_DATA_DIR
+ basedir=ctdldir;
+#else
+ basedir=DATA_DIR;
+#endif
+ COMPUTE_DIRECTORY(ctdl_bio_dir);
+ COMPUTE_DIRECTORY(ctdl_bb_dir);
+ COMPUTE_DIRECTORY(ctdl_data_dir);
+ COMPUTE_DIRECTORY(ctdl_file_dir);
+ COMPUTE_DIRECTORY(ctdl_hlp_dir);
+ COMPUTE_DIRECTORY(ctdl_image_dir);
+ COMPUTE_DIRECTORY(ctdl_info_dir);
+ COMPUTE_DIRECTORY(ctdl_message_dir);
+ COMPUTE_DIRECTORY(ctdl_usrpic_dir);
+#ifndef HAVE_SPOOL_DIR
+ basedir=ctdldir;
+#else
+ basedir=SPOOL_DIR;
+#endif
+ COMPUTE_DIRECTORY(ctdl_spool_dir);
+ COMPUTE_DIRECTORY(ctdl_netout_dir);
+ COMPUTE_DIRECTORY(ctdl_netin_dir);
+
+
+ /* daemonize, if we were asked to */
+ if (running_as_daemon) {
+ start_daemon(0);
+ drop_root_perms = 1;
+ }
+
+ /* 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) {
+ if (running_as_daemon) {
+ openlog("citadel", LOG_NDELAY, 0);
+ }
+ else {
+ openlog("citadel", LOG_PERROR|LOG_NDELAY, 0);
+ }
+ setlogmask(LOG_UPTO(verbosity));
+ }
+
/* Tell 'em who's in da house */
lprintf(CTDL_NOTICE, "\n");
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");
* Bind the server to a Unix-domain socket.
*/
CtdlRegisterServiceHook(0,
- "citadel.socket",
+#ifndef HAVE_RUN_DIR
+ "."
+#else
+ RUN_DIR
+#endif
+ "/citadel.socket",
citproto_begin_session,
do_command_loop,
do_async_loop);
* 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)
/*
* 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 indexer thread. */
+ create_maintenance_threads();
- /* Server is exiting. Wait for workers to shutdown. */
- lprintf(CTDL_INFO, "Server is shutting down.\n");
- master_cleanup();
+ /* 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