X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=0503221dae6fdf5619361878d04fbcc197e1fb36;hb=983b1699a778b7f0db81406157f764fcfe87f09c;hp=68f663b4dda06ef58be8033ea12fbbcaf2eb68bb;hpb=2ef24f6cd3fe8fa8540535d01c63e632922e8354;p=citadel.git diff --git a/citadel/server_main.c b/citadel/server_main.c index 68f663b4d..0503221da 100644 --- a/citadel/server_main.c +++ b/citadel/server_main.c @@ -38,24 +38,28 @@ #include #include #include -#ifdef HAVE_PTHREAD_H -#include -#endif #ifdef HAVE_SYS_PRCTL_H #include #endif +#include #include "citadel.h" #include "server.h" #include "serv_extensions.h" #include "sysdep_decls.h" +#include "threads.h" #include "citserver.h" #include "support.h" #include "config.h" +#include "control.h" #include "database.h" +#include "user_ops.h" #include "housekeeping.h" -#include "tools.h" +#include "svn_revision.h" #include "citadel_dirs.c" +#include "modules_init.h" +#include "ecrash.h" + #ifdef HAVE_SYS_SELECT_H #include #endif @@ -63,8 +67,14 @@ #ifndef HAVE_SNPRINTF #include "snprintf.h" #endif +const char *CitadelServiceUDS="citadel-UDS"; +const char *CitadelServiceTCP="citadel-TCP"; + -int running_as_daemon = 0; +extern struct CitContext masterCC; + + +void go_threading(void); /* * Here's where it all begins. @@ -72,15 +82,27 @@ int running_as_daemon = 0; int main(int argc, char **argv) { char facility[32]; - int a, i; /* General-purpose variables */ - struct passwd *pw; + 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; +#ifdef HAVE_RUN_DIR struct stat filestats; +#endif +#ifdef HAVE_BACKTRACE + eCrashParameters params; +// eCrashSymbolTable symbol_table; +#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(); @@ -119,8 +141,8 @@ int main(int argc, char **argv) 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; } /* -r tells the server not to drop root permissions. don't use @@ -131,10 +153,10 @@ int main(int argc, char **argv) /* 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] " " [-tTraceFile]" " [-xLogLevel] [-hHomeDir]\n"); exit(1); @@ -142,57 +164,78 @@ int main(int argc, char **argv) } - calc_dirs_n_files(relh, home, relhome, ctdldir); - + calc_dirs_n_files(relh, home, relhome, ctdldir, dbg); /* daemonize, if we were asked to */ if (running_as_daemon) { start_daemon(0); drop_root_perms = 1; } +#ifdef HAVE_BACKTRACE + bzero(¶ms, sizeof(params)); + params.filename = file_pid_paniclog; + panic_fd=open(file_pid_paniclog, O_APPEND|O_CREAT|O_DIRECT); + params.filep = fopen(file_pid_paniclog, "a+"); + params.debugLevel = ECRASH_DEBUG_VERBOSE; + params.dumpAllThreads = TRUE; + params.useBacktraceSymbols = 1; + params.signals[0]=SIGSEGV; + params.signals[1]=SIGILL; + params.signals[2]=SIGBUS; + params.signals[3]=SIGABRT; + eCrash_Init(¶ms); + 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) { - if (running_as_daemon) { - openlog("citadel", LOG_NDELAY, 0); - } - else { - openlog("citadel", LOG_PERROR|LOG_NDELAY, 0); - } + openlog("citadel", LOG_NDELAY, 0); setlogmask(LOG_UPTO(verbosity)); } /* 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-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]); + 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){ - pw=getpwuid(config.c_ctdluid); +#ifdef HAVE_GETPWUID_R +#ifdef SOLARIS_GETPWUID + pwp = getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf)); +#else // SOLARIS_GETPWUID + getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp); +#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, (pw==NULL)?-1:pw->pw_gid); - + chown(ctdl_run_dir, config.c_ctdluid, (pwp==NULL)?-1:pw.pw_gid); } @@ -206,14 +249,37 @@ int main(int argc, char **argv) */ master_startup(); + /* + * 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. */ CtdlRegisterServiceHook(0, - file_citadel_socket, - citproto_begin_session, - do_command_loop, - do_async_loop); + file_citadel_socket, + citproto_begin_session, + do_command_loop, + do_async_loop, + CitadelServiceUDS); /* * Bind the server to our favorite TCP port (usually 504). @@ -222,33 +288,59 @@ int main(int argc, char **argv) NULL, citproto_begin_session, do_command_loop, - do_async_loop); + 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; - initialize_server_extensions(); + + initialise_modules(0); + + + + /* + * If we need host auth, start our chkpwd daemon. + */ + if (config.c_auth_mode == AUTHMODE_HOST) { + start_chkpwd_daemon(); + } /* * 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(CTDLUID)) == NULL) - lprintf(CTDL_CRIT, "WARNING: getpwuid(%ld): %s\n" + 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 // SOLARIS_GETPWUID + getpwuid_r(config.c_ctdluid, &pw, pwbuf, sizeof(pwbuf), &pwp); +#endif // SOLARIS_GETPWUID +#else // HAVE_GETPWUID_R + pwp = NULL; +#endif // HAVE_GETPWUID_R + + if (pwp == NULL) + 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, + initgroups(pw.pw_name, pw.pw_gid); + if (setgid(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); @@ -258,26 +350,9 @@ int main(int argc, char **argv) /* We want to check for idle sessions once per minute */ CtdlRegisterSessionHook(terminate_idle_sessions, EVT_TIMER); - /* - * Now create a bunch of worker threads. - */ - 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); - - /* Create the indexer thread. */ - create_maintenance_threads(); - - /* 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); + go_threading(); + + + master_cleanup(exit_signal); return(0); }