X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=citadel%2Fserver_main.c;h=68af7888e9ef221011eb88f6d523d2736d6a6ac6;hb=6d051cee6f669b6ecd950e933a95644f3cf097ea;hp=3f99aa576e29700bdc91d177830bd130c684af56;hpb=ad21da5a385d8455b48c64991adf1bbb3050f04f;p=citadel.git diff --git a/citadel/server_main.c b/citadel/server_main.c index 3f99aa576..68af7888e 100644 --- a/citadel/server_main.c +++ b/citadel/server_main.c @@ -1,7 +1,7 @@ /* * citserver's main() function lives here. * - * Copyright (c) 1987-2017 by the citadel.org team + * Copyright (c) 1987-2020 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. @@ -11,8 +11,11 @@ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. */ +#include +#include #include #include +#include #include #include #include @@ -25,52 +28,42 @@ #include "serv_extensions.h" #include "citadel_dirs.h" #include "user_ops.h" -#include "ecrash.h" uid_t ctdluid = 0; const char *CitadelServiceUDS="citadel-UDS"; const char *CitadelServiceTCP="citadel-TCP"; - - - -void go_threading(void); - +int sanity_diag_mode = 0; /* * Create or remove a lock file, so we only have one Citadel Server running at a time. */ void ctdl_lockfile(int yo) { - static char lockfilename[SIZ]; + static char lockfilename[PATH_MAX]; static FILE *fp; - if (yo) { - syslog(LOG_DEBUG, "Creating lockfile"); + syslog(LOG_DEBUG, "main: creating lockfile"); snprintf(lockfilename, sizeof lockfilename, "%s/citadel.lock", ctdl_run_dir); fp = fopen(lockfilename, "w"); if (!fp) { - syslog(LOG_ERR, "Cannot open or create %s", lockfilename); + syslog(LOG_ERR, "%s: %m", lockfilename); exit(CTDLEXIT_DB); } if (flock(fileno(fp), (LOCK_EX|LOCK_NB)) != 0) { - syslog(LOG_ERR, "Cannot lock %s , is another citserver running?", lockfilename); + syslog(LOG_ERR, "main: cannot lock %s , is another citserver running?", lockfilename); exit(CTDLEXIT_DB); } return; } - syslog(LOG_DEBUG, "Removing lockfile"); + syslog(LOG_DEBUG, "main: removing lockfile"); unlink(lockfilename); flock(fileno(fp), LOCK_UN); fclose(fp); } - - - - /* * Here's where it all begins. */ @@ -85,18 +78,14 @@ int main(int argc, char **argv) int relh=0; int home=0; int dbg=0; + int max_log_level = LOG_INFO; char relhome[PATH_MAX]=""; char ctdldir[PATH_MAX]=CTDLDIR; int syslog_facility = LOG_DAEMON; - const char *eDebuglist[] = {NULL, NULL}; uid_t u = 0; struct passwd *p = NULL; #ifdef HAVE_RUN_DIR struct stat filestats; -#endif -#ifdef HAVE_BACKTRACE - eCrashParameters params; -// eCrashSymbolTable symbol_table; #endif /* initialize the master context */ @@ -104,7 +93,7 @@ int main(int argc, char **argv) InitializeMasterTSD(); /* parse command-line arguments */ - while ((a=getopt(argc, argv, "l:dh:x:t:B:Dru:")) != EOF) switch(a) { + while ((a=getopt(argc, argv, "l:dh:x:t:B:Dru:s:")) != EOF) switch(a) { case 'l': safestrncpy(facility, optarg, sizeof(facility)); @@ -128,7 +117,7 @@ int main(int argc, char **argv) break; case 'x': - eDebuglist [0] = optarg; + max_log_level = atoi(optarg); break; case 't': /* deprecated */ @@ -165,11 +154,17 @@ int main(int argc, char **argv) } break; + /* -s tells the server to behave differently during sanity checks */ + case 's': + sanity_diag_mode = atoi(optarg); + break; + default: /* any other parameter makes it crash and burn */ fprintf(stderr, "citserver: usage: " "citserver " "[-l LogFacility] " + "[-x MaxLogLevel] " "[-d] [-D] [-r] " "[-u user] " "[-h HomeDir]\n" @@ -200,6 +195,7 @@ int main(int argc, char **argv) } StartLibCitadel(basesize); + setlogmask(LOG_UPTO(max_log_level)); openlog("citserver", ( running_as_daemon ? (LOG_PID) : (LOG_PID | LOG_PERROR) ), syslog_facility @@ -212,39 +208,27 @@ int main(int argc, char **argv) drop_root_perms = 1; } -#if 0 - def 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 - /* Tell 'em who's in da house */ - syslog(LOG_NOTICE, " "); - syslog(LOG_NOTICE, " "); - syslog(LOG_NOTICE, "*** Citadel server engine ***\n"); - syslog(LOG_NOTICE, "Version %d (build %s) ***", REV_LEVEL, svn_revision()); - syslog(LOG_NOTICE, "Copyright (C) 1987-2017 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, " "); + syslog(LOG_INFO, " "); + syslog(LOG_INFO, "*** Citadel server engine ***\n"); + syslog(LOG_INFO, "Version %d (build %s) ***", REV_LEVEL, svn_revision()); + syslog(LOG_INFO, "Copyright (C) 1987-2020 by the Citadel development team."); + syslog(LOG_INFO, " "); + syslog(LOG_INFO, "This program is open source software: you can redistribute it and/or"); + syslog(LOG_INFO, "modify it under the terms of the GNU General Public License, version 3."); + syslog(LOG_INFO, " "); + syslog(LOG_INFO, "This program is distributed in the hope that it will be useful,"); + syslog(LOG_INFO, "but WITHOUT ANY WARRANTY; without even the implied warranty of"); + syslog(LOG_INFO, "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the"); + syslog(LOG_INFO, "GNU General Public License for more details."); + syslog(LOG_INFO, " "); syslog(LOG_INFO, "%s", libcitadel_version_string()); #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){ + if (stat(ctdl_run_dir, &filestats) == -1) { #ifdef HAVE_GETPWUID_R #ifdef SOLARIS_GETPWUID pwp = getpwuid_r(ctdluid, &pw, pwbuf, sizeof(pwbuf)); @@ -255,41 +239,23 @@ int main(int argc, char **argv) pwp = NULL; #endif // HAVE_GETPWUID_R - if ((mkdir(ctdl_run_dir, 0755) != 0) && (errno != EEXIST)) - syslog(LOG_EMERG, - "unable to create run directory [%s]: %s", - ctdl_run_dir, strerror(errno)); + if ((mkdir(ctdl_run_dir, 0755) != 0) && (errno != EEXIST)) { + syslog(LOG_ERR, "main: unable to create run directory [%s]: %m", ctdl_run_dir); + } - if (chown(ctdl_run_dir, ctdluid, (pwp==NULL)?-1:pw.pw_gid) != 0) - syslog(LOG_EMERG, - "unable to set the access rights for [%s]: %s", - ctdl_run_dir, strerror(errno)); + if (chown(ctdl_run_dir, ctdluid, (pwp==NULL)?-1:pw.pw_gid) != 0) { + syslog(LOG_ERR, "main: unable to set the access rights for [%s]: %m", ctdl_run_dir); + } } - - #endif ctdl_lockfile(1); - - /* Initialize... */ - init_sysdep(); - - /* - * Do non system dependent startup functions. - */ - master_startup(); - - /* - * Check that the control record is correct and place sensible values if it isn't - */ - check_control(); - - /* - * Run any upgrade entry points - */ - syslog(LOG_INFO, "Upgrading modules."); + init_sysdep(); // Initialize... + master_startup(); // Do non system dependent startup functions + check_control(); // Check/sanitize/initialize control record, fix user indexes + syslog(LOG_INFO, "main: upgrading modules"); // Run any upgrade entry points upgrade_modules(); - + /* * Load the user for the masterCC or create them if they don't exist */ @@ -332,19 +298,13 @@ int main(int argc, char **argv) do_async_loop, CitadelServiceTCP); - - - /* * Load any server-side extensions available here. */ - syslog(LOG_INFO, "Initializing server extensions"); + syslog(LOG_INFO, "main: initializing server extensions"); initialise_modules(0); - eDebuglist[1] = getenv("CITADEL_LOGDEBUG"); - CtdlSetDebugLogFacilities(eDebuglist, 2); - /* * If we need host auth, start our chkpwd daemon. */ @@ -352,13 +312,11 @@ int main(int argc, char **argv) start_chkpwd_daemon(); } - /* * check, whether we're fired up another time after a crash. * if, post an aide message, so the admin has a chance to react. */ - checkcrash (); - + checkcrash(); /* * Now that we've bound the sockets, change to the Citadel user id and its @@ -378,18 +336,15 @@ int main(int argc, char **argv) #endif // HAVE_GETPWUID_R if (pwp == NULL) - syslog(LOG_CRIT, "WARNING: getpwuid(%ld): %s" - "Group IDs will be incorrect.\n", (long)CTDLUID, - strerror(errno)); + syslog(LOG_ERR, "main: WARNING, getpwuid(%ld): %m Group IDs will be incorrect.", (long)CTDLUID); else { initgroups(pw.pw_name, pw.pw_gid); if (setgid(pw.pw_gid)) - syslog(LOG_CRIT, "setgid(%ld): %s", (long)pw.pw_gid, - strerror(errno)); + syslog(LOG_ERR, "main: setgid(%ld): %m", (long)pw.pw_gid); } - syslog(LOG_INFO, "Changing uid to %ld", (long)CTDLUID); + syslog(LOG_INFO, "main: changing uid to %ld", (long)CTDLUID); if (setuid(CTDLUID) != 0) { - syslog(LOG_CRIT, "setuid() failed: %s", strerror(errno)); + syslog(LOG_ERR, "main: setuid() failed: %m"); } #if defined (HAVE_SYS_PRCTL_H) && defined (PR_SET_DUMPABLE) prctl(PR_SET_DUMPABLE, 1); @@ -403,5 +358,8 @@ int main(int argc, char **argv) int exit_code = master_cleanup(exit_signal); ctdl_lockfile(0); + if (restart_server) { + execv(argv[0], argv); + } return(exit_code); }