#include <stdarg.h>
#include <grp.h>
#include <pwd.h>
-#ifdef HAVE_PTHREAD_H
-#include <pthread.h>
-#endif
#ifdef HAVE_SYS_PRCTL_H
#include <sys/prctl.h>
#endif
#include "server.h"
#include "serv_extensions.h"
#include "sysdep_decls.h"
+#include "threads.h"
#include "citserver.h"
#include "support.h"
#include "config.h"
#include "database.h"
#include "user_ops.h"
#include "housekeeping.h"
+#include "svn_revision.h"
#include "citadel_dirs.c"
#include "modules_init.h"
const char *CitadelServiceUDS="citadel-UDS";
const char *CitadelServiceTCP="citadel-TCP";
+
+extern struct CitContext masterCC;
+
+
+void go_threading(void);
+
/*
* Here's where it all begins.
*/
int main(int argc, char **argv)
{
char facility[32];
- int a, i; /* General-purpose variables */
+ int a; /* General-purpose variables */
struct passwd pw, *pwp = NULL;
char pwbuf[SIZ];
int drop_root_perms = 1;
// eCrashSymbolTable symbol_table;
#endif
/* initialise semaphores here. Patch by Matt and davew
- * its called here as they are needed by lprintf for thread safety
+ * its called here as they are needed by CtdlLogPrintf for thread safety
*/
- CtdlInitBase64Table();
InitialiseSemaphores();
/* initialize the master context */
freopen(&argv[a][2], "w", stderr);
}
- else if (!strncmp(argv[a], "-f", 2)) {
- do_defrag = 1;
- }
-
else if (!strncmp(argv[a], "-D", 2)) {
dbg = 1;
}
/* any other parameter makes it crash and burn */
else {
- lprintf(CTDL_EMERG, "citserver: usage: "
+ CtdlLogPrintf(CTDL_EMERG, "citserver: usage: "
"citserver "
"[-lLogFacility] "
- "[-d] [-f] [-D] "
+ "[-d] [-D] "
" [-tTraceFile]"
" [-xLogLevel] [-hHomeDir]\n");
exit(1);
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;
-
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
}
/* Tell 'em who's in da house */
- lprintf(CTDL_NOTICE, "\n");
- lprintf(CTDL_NOTICE, "\n");
- lprintf(CTDL_NOTICE,
- "*** Citadel server engine v%d.%02d ***\n",
- (REV_LEVEL/100), (REV_LEVEL%100));
- lprintf(CTDL_NOTICE,
- "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");
- lprintf(CTDL_NOTICE, "\n");
- lprintf(CTDL_DEBUG, "Called as: %s\n", argv[0]);
- lprintf(CTDL_INFO, "%s\n", libcitadel_version_string());
+ CtdlLogPrintf(CTDL_NOTICE, "\n");
+ CtdlLogPrintf(CTDL_NOTICE, "\n");
+ CtdlLogPrintf(CTDL_NOTICE,
+ "*** Citadel server engine v%d.%02d (build %s) ***\n",
+ (REV_LEVEL/100), (REV_LEVEL%100), svn_revision());
+ CtdlLogPrintf(CTDL_NOTICE, "Copyright (C) 1987-2008 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 */
- lprintf(CTDL_INFO, "Loading citadel.config\n");
+ CtdlLogPrintf(CTDL_INFO, "Loading citadel.config\n");
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");
+ get_control();
+
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 HAVE_GETPWUID_R
#ifdef SOLARIS_GETPWUID
pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
-#else
+#else // SOLARIS_GETPWUID
getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
-#endif
+#endif // SOLARIS_GETPWUID
+#else // HAVE_GETPWUID_R
+ pwp = NULL;
+#endif // HAVE_GETPWUID_R
mkdir(ctdl_run_dir, 0755);
chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid);
}
*/
master_startup();
- lprintf(CTDL_INFO, "Acquiring control record\n");
- get_control();
-
+ /*
+ * Check that the control record is correct and place sensible values if it isn't
+ */
+ check_control();
+
+ /*
+ * Run any upgrade entry points
+ */
+ CtdlLogPrintf(CTDL_INFO, "Upgrading modules.\n");
+ upgrade_modules();
+
+/**
+ * Load the user for the masterCC or create them if they don't exist
+ */
+ if (getuser(&masterCC.user, "SYS_Citadel"))
+ {
+ /** 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") ;
+ putuser(&masterCC.user);
+ getuser(&masterCC.user, "SYS_Citadel"); /** Just to be safe */
+ }
+
/*
* Bind the server to a Unix-domain socket.
*/
do_async_loop,
CitadelServiceTCP);
+
+
+
/*
* Load any server-side extensions available here.
*/
- lprintf(CTDL_INFO, "Initializing server extensions\n");
+ CtdlLogPrintf(CTDL_INFO, "Initializing server extensions\n");
size = strlen(ctdl_home_directory) + 9;
initialise_modules(0);
/*
* If we need host auth, start our chkpwd daemon.
*/
- if (config.c_auth_mode == 1) {
+ if (config.c_auth_mode == AUTHMODE_HOST) {
start_chkpwd_daemon();
}
if (drop_root_perms) {
cdb_chmod_data(); /* make sure we own our data files */
+#ifdef HAVE_GETPWUID_R
#ifdef SOLARIS_GETPWUID
pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf));
-#else
+#else // SOLARIS_GETPWUID
getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp);
-#endif
+#endif // SOLARIS_GETPWUID
+#else // HAVE_GETPWUID_R
+ pwp = NULL;
+#endif // HAVE_GETPWUID_R
+
if (pwp == NULL)
- lprintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
+ CtdlLogPrintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n"
"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,
+ CtdlLogPrintf(CTDL_CRIT, "setgid(%ld): %s\n", (long)pw.pw_gid,
strerror(errno));
}
- lprintf(CTDL_INFO, "Changing uid to %ld\n", (long)CTDLUID);
+ CtdlLogPrintf(CTDL_INFO, "Changing uid to %ld\n", (long)CTDLUID);
if (setuid(CTDLUID) != 0) {
- lprintf(CTDL_CRIT, "setuid() failed: %s\n", strerror(errno));
+ CtdlLogPrintf(CTDL_CRIT, "setuid() failed: %s\n", 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);
- /*
- * Initialise the thread system
- */
- ctdl_thread_internal_init();
+ go_threading();
- /*
- * Now create a bunch of worker threads.
- */
- CtdlLogPrintf(CTDL_DEBUG, "Starting %d worker threads\n",
- config.c_min_workers-1);
- begin_critical_section(S_THREAD_LIST);
- for (i=0; i<(config.c_min_workers-1); ++i) {
- ctdl_internal_create_thread("Worker Thread", CTDLTHREAD_BIGSTACK + CTDLTHREAD_WORKER, worker_thread, NULL);
- }
- end_critical_section(S_THREAD_LIST);
-
- /* Second call to module init functions now that threading is up */
- initialise_modules(1);
-
- /*
- * This thread is now used for garbage collection of other threads in the thread list
- */
- CtdlLogPrintf(CTDL_INFO, "Startup thread %d becoming garbage collector,\n", pthread_self());
-
- /* Sleep 10 seconds before first garbage collection */
- CtdlThreadSleep(10);
-
- while (CtdlThreadGetCount())
- {
- ctdl_thread_internal_calc_loadavg();
- CtdlThreadSleep(1);
- ctdl_internal_thread_gc();
- if (CtdlThreadGetCount() <= 1) // Shutting down clean up the garbage collector
- ctdl_internal_thread_gc();
- }
- /*
- * If the above loop exits we must be shutting down since we obviously have no threads
- */
- ctdl_thread_internal_cleanup();
master_cleanup(exit_signal);
return(0);
projects / citadel.git / blobdiff