#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
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();