/*
* citserver's main() function lives here.
*
- * Copyright (c) 1987-2012 by the citadel.org team
+ * Copyright (c) 1987-2014 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 version 3.
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*/
-
-#include "sysdep.h"
-#include <stdlib.h>
-#include <unistd.h>
#include <stdio.h>
-#include <fcntl.h>
-#include <ctype.h>
-#include <signal.h>
#include <sys/types.h>
-#include <sys/stat.h>
-#include <sys/wait.h>
-#include <sys/socket.h>
-#include <syslog.h>
-
-#if TIME_WITH_SYS_TIME
-# include <sys/time.h>
-# include <time.h>
-#else
-# if HAVE_SYS_TIME_H
-# include <sys/time.h>
-# else
-# include <time.h>
-# endif
-#endif
-
-#include <limits.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <sys/un.h>
-#include <string.h>
-#include <pwd.h>
-#include <errno.h>
-#include <stdarg.h>
#include <grp.h>
-#include <pwd.h>
-#ifdef HAVE_SYS_PRCTL_H
-#include <sys/prctl.h>
-#endif
#include <libcitadel.h>
-#include "citadel.h"
-#include "server.h"
-#include "serv_extensions.h"
-#include "sysdep_decls.h"
-#include "threads.h"
+
#include "citserver.h"
-#include "support.h"
+#include "svn_revision.h"
+#include "modules_init.h"
#include "config.h"
#include "control.h"
-#include "database.h"
-#include "user_ops.h"
-#include "housekeeping.h"
-#include "svn_revision.h"
+#include "serv_extensions.h"
#include "citadel_dirs.h"
-
-#include "context.h"
-
-#include "modules_init.h"
+#include "user_ops.h"
#include "ecrash.h"
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
const char *CitadelServiceUDS="citadel-UDS";
const char *CitadelServiceTCP="citadel-TCP";
*/
int main(int argc, char **argv)
{
+ size_t basesize = 64;
char facility[32];
int a; /* General-purpose variables */
struct passwd pw, *pwp = NULL;
char relhome[PATH_MAX]="";
char ctdldir[PATH_MAX]=CTDLDIR;
int syslog_facility = LOG_DAEMON;
+ const char *eDebuglist[] = {NULL, NULL};
#ifdef HAVE_RUN_DIR
struct stat filestats;
#endif
InitializeMasterTSD();
/* parse command-line arguments */
- for (a=1; a<argc; ++a) {
+ while ((a=getopt(argc, argv, "l:dh:x:t:B:Dr")) != EOF) switch(a) {
- if (!strncmp(argv[a], "-l", 2)) {
- safestrncpy(facility, &argv[a][2], sizeof(facility));
+ case 'l':
+ safestrncpy(facility, optarg, sizeof(facility));
syslog_facility = SyslogFacility(facility);
- }
+ break;
/* run in the background if -d was specified */
- else if (!strcmp(argv[a], "-d")) {
+ case 'd':
running_as_daemon = 1;
- }
+ break;
- else if (!strncmp(argv[a], "-h", 2)) {
- relh=argv[a][2]!='/';
+ case 'h':
+ relh = optarg[0] != '/';
if (!relh) {
- safestrncpy(ctdl_home_directory, &argv[a][2], sizeof ctdl_home_directory);
+ safestrncpy(ctdl_home_directory, optarg, sizeof ctdl_home_directory);
}
else {
- safestrncpy(relhome, &argv[a][2], sizeof relhome);
+ safestrncpy(relhome, optarg, sizeof relhome);
}
home=1;
- }
+ break;
- else if (!strncmp(argv[a], "-x", 2)) {
- /* deprecated */
- }
+ case 'x':
+ eDebuglist [0] = optarg;
+ break;
- else if (!strncmp(argv[a], "-t", 2)) {
- /* deprecated */
- }
+ case 't': /* deprecated */
+ break;
+ case 'B': /* Basesize */
+ basesize = atoi(optarg);
+ break;
- else if (!strncmp(argv[a], "-D", 2)) {
+ case 'D':
dbg = 1;
- }
+ break;
- /* -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")) {
+ /* -r tells the server not to drop root permissions.
+ * Don't use this unless you know what you're doing.
+ */
+ case 'r':
drop_root_perms = 0;
- }
+ break;
+ default:
/* any other parameter makes it crash and burn */
- else {
fprintf(stderr, "citserver: usage: "
"citserver "
- "[-lLogFacility] "
- "[-d] [-D] [-s] "
- "[-hHomeDir]\n"
+ "[-l LogFacility] "
+ "[-d] [-D] [-r] "
+ "[-h HomeDir]\n"
);
exit(1);
- }
-
}
-
+ StartLibCitadel(basesize);
openlog("citserver",
( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ),
syslog_facility
syslog(LOG_NOTICE,
"*** Citadel server engine v%d.%02d (build %s) ***",
(REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
- syslog(LOG_NOTICE, "Copyright (C) 1987-2012 by the Citadel development team.");
+ syslog(LOG_NOTICE, "Copyright (C) 1987-2014 by the Citadel development team.");
syslog(LOG_NOTICE, "This program is distributed under the terms of the GNU "
"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 */
+ /* Load site-specific configuration */
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");
*/
CtdlRegisterServiceHook(0,
file_citadel_admin_socket,
- citproto_begin_session,
+ citproto_begin_admin_session,
do_command_loop,
do_async_loop,
CitadelServiceUDS);
initialise_modules(0);
+ eDebuglist[1] = getenv("CITADEL_LOGDEBUG");
+ CtdlSetDebugLogFacilities(eDebuglist, 2);
+
/*
* If we need host auth, start our chkpwd daemon.
*/
}
/* We want to check for idle sessions once per minute */
- CtdlRegisterSessionHook(terminate_idle_sessions, EVT_TIMER);
+ CtdlRegisterSessionHook(terminate_idle_sessions, EVT_TIMER, PRIO_CLEANUP + 1);
go_threading();
projects / citadel.git / blobdiff