/*
- * $Id$
- *
* citserver's main() function lives here.
*
- * Copyright (c) 1987-2010 by the citadel.org team
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * Copyright (c) 1987-2014 by the citadel.org team
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * 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.
*
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * 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 pwbuf[SIZ];
int drop_root_perms = 1;
- size_t size;
int relh=0;
int home=0;
int dbg=0;
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
// eCrashSymbolTable symbol_table;
#endif
-#ifdef HAVE_GC
- GC_INIT();
- GC_find_leak = 1;
-#endif
-
-
- /* initialise semaphores here. Patch by Matt and davew
- * its called here as they are needed by CtdlLogPrintf for thread safety
- */
- InitialiseSemaphores();
-
/* initialize the master context */
InitializeMasterCC();
+ 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);
- enable_syslog = 1;
- }
+ break;
/* run in the background if -d was specified */
- else if (!strcmp(argv[a], "-d")) {
+ case 'd':
running_as_daemon = 1;
- }
-
- /* run a few stats if -s was specified */
- else if (!strncmp(argv[a], "-s", 2)) {
- statcount = atoi(&argv[a][2]);
- }
-
- /* -x specifies the desired logging level */
- else if (!strncmp(argv[a], "-x", 2)) {
- verbosity = atoi(&argv[a][2]);
- }
+ break;
- else if (!strncmp(argv[a], "-h", 2)) {
- 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);
+ case 'h':
+ relh = optarg[0] != '/';
+ if (!relh) {
+ safestrncpy(ctdl_home_directory, optarg, sizeof ctdl_home_directory);
+ }
+ else {
+ safestrncpy(relhome, optarg, sizeof relhome);
+ }
home=1;
- }
+ break;
- else if (!strncmp(argv[a], "-t", 2)) {
- if (freopen(&argv[a][2], "w", stderr) != stderr)
- {
- CtdlLogPrintf(CTDL_EMERG,
- "unable to open your trace log [%s]: %s",
- &argv[a][2],
- strerror(errno));
- exit(1);
- }
- }
+ case 'x':
+ eDebuglist [0] = optarg;
+ break;
+
+ 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 {
- CtdlLogPrintf(CTDL_EMERG, "citserver: usage: "
+ fprintf(stderr, "citserver: usage: "
"citserver "
- "[-lLogFacility] "
- "[-d] [-D] [-s]"
- " [-tTraceFile]"
- " [-xLogLevel] [-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
+ );
calc_dirs_n_files(relh, home, relhome, ctdldir, dbg);
/* daemonize, if we were asked to */
eCrash_RegisterThread("MasterThread", 0);
#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 */
- CtdlLogPrintf(CTDL_NOTICE, "\n");
- CtdlLogPrintf(CTDL_NOTICE, "\n");
- CtdlLogPrintf(CTDL_NOTICE,
- "*** Citadel server engine v%d.%02d (build %s) ***\n",
+ syslog(LOG_NOTICE, " ");
+ syslog(LOG_NOTICE, " ");
+ syslog(LOG_NOTICE,
+ "*** Citadel server engine v%d.%02d (build %s) ***",
(REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
- CtdlLogPrintf(CTDL_NOTICE, "Copyright (C) 1987-2010 by the Citadel development team.\n");
- CtdlLogPrintf(CTDL_NOTICE, "This program is distributed under the terms of the GNU "
- "General Public License.\n");
- CtdlLogPrintf(CTDL_NOTICE, "\n");
- CtdlLogPrintf(CTDL_DEBUG, "Called as: %s\n", argv[0]);
- CtdlLogPrintf(CTDL_INFO, "%s\n", libcitadel_version_string());
-
- /* Load site-specific parameters, and set the ipgm secret */
- CtdlLogPrintf(CTDL_INFO, "Loading citadel.config\n");
+ 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 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!! */
- CtdlLogPrintf(CTDL_INFO, "Acquiring control record\n");
+ syslog(LOG_INFO, "Acquiring control record");
get_control();
put_config();
#endif // HAVE_GETPWUID_R
if ((mkdir(ctdl_run_dir, 0755) != 0) && (errno != EEXIST))
- CtdlLogPrintf(CTDL_EMERG,
+ syslog(LOG_EMERG,
"unable to create run directory [%s]: %s",
ctdl_run_dir, strerror(errno));
if (chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid) != 0)
- CtdlLogPrintf(CTDL_EMERG,
+ syslog(LOG_EMERG,
"unable to set the access rights for [%s]: %s",
ctdl_run_dir, strerror(errno));
}
/*
* Run any upgrade entry points
*/
- CtdlLogPrintf(CTDL_INFO, "Upgrading modules.\n");
+ syslog(LOG_INFO, "Upgrading modules.");
upgrade_modules();
-/**
+/*
* Load the user for the masterCC or create them if they don't exist
*/
if (CtdlGetUser(&masterCC.user, "SYS_Citadel"))
{
- /** User doesn't exist. We can't use create user here as the user number needs to be 0 */
+ /* User doesn't exist. We can't use create user here as the user number needs to be 0 */
strcpy (masterCC.user.fullname, "SYS_Citadel") ;
CtdlPutUser(&masterCC.user);
- CtdlGetUser(&masterCC.user, "SYS_Citadel"); /** Just to be safe */
+ CtdlGetUser(&masterCC.user, "SYS_Citadel"); /* Just to be safe */
}
/*
- * Bind the server to a Unix-domain socket.
+ * Bind the server to a Unix-domain socket (user client access)
*/
CtdlRegisterServiceHook(0,
file_citadel_socket,
do_async_loop,
CitadelServiceUDS);
+ /*
+ * Bind the server to a Unix-domain socket (admin client access)
+ */
+ CtdlRegisterServiceHook(0,
+ file_citadel_admin_socket,
+ citproto_begin_admin_session,
+ do_command_loop,
+ do_async_loop,
+ CitadelServiceUDS);
+ chmod(file_citadel_admin_socket, S_IRWXU); /* for your eyes only */
+
/*
* Bind the server to our favorite TCP port (usually 504).
*/
/*
* Load any server-side extensions available here.
*/
- CtdlLogPrintf(CTDL_INFO, "Initializing server extensions\n");
- size = strlen(ctdl_home_directory) + 9;
+ syslog(LOG_INFO, "Initializing server extensions");
initialise_modules(0);
-
-
+
+ eDebuglist[1] = getenv("CITADEL_LOGDEBUG");
+ CtdlSetDebugLogFacilities(eDebuglist, 2);
/*
* If we need host auth, start our chkpwd daemon.
#endif // HAVE_GETPWUID_R
if (pwp == NULL)
- CtdlLogPrintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
+ syslog(LOG_CRIT, "WARNING: getpwuid(%ld): %s"
"Group IDs will be incorrect.\n", (long)CTDLUID,
strerror(errno));
else {
initgroups(pw.pw_name, pw.pw_gid);
if (setgid(pw.pw_gid))
- CtdlLogPrintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw.pw_gid,
+ syslog(LOG_CRIT, "setgid(%ld): %s", (long)pw.pw_gid,
strerror(errno));
}
- CtdlLogPrintf(CTDL_INFO, "Changing uid to %ld\n", (long)CTDLUID);
+ syslog(LOG_INFO, "Changing uid to %ld", (long)CTDLUID);
if (setuid(CTDLUID) != 0) {
- CtdlLogPrintf(CTDL_CRIT, "setuid() failed: %s\n", strerror(errno));
+ syslog(LOG_CRIT, "setuid() failed: %s", strerror(errno));
}
#if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE)
prctl(PR_SET_DUMPABLE, 1);
}
/* 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();
-
master_cleanup(exit_signal);
return(0);
}
projects / citadel.git / blobdiff