From aeaf8a5156ad3264e7dd3ead97366fba5ab4f74d Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 20 Apr 2015 18:44:27 -0400 Subject: [PATCH] get_config() is now called from master_startup() immediately after the databases are opened. --- citadel/citserver.c | 15 +++++++++++++-- citadel/server_main.c | 11 ----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/citadel/citserver.c b/citadel/citserver.c index 765556caf..0ba312446 100644 --- a/citadel/citserver.c +++ b/citadel/citserver.c @@ -1,7 +1,7 @@ /* * Main source module for the Citadel server * - * Copyright (c) 1987-2014 by the citadel.org team + * Copyright (c) 1987-2015 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. @@ -124,7 +124,7 @@ void master_startup(void) { time(&server_startup_time); syslog(LOG_INFO, "Checking directory access"); - if ((pw = getpwuid(CTDLUID)) == NULL) { + if ((pw = getpwuid(ctdluid)) == NULL) { gid = getgid(); } else { gid = pw->pw_gid; @@ -136,6 +136,17 @@ void master_startup(void) { } syslog(LOG_INFO, "Opening databases"); open_databases(); + + /* Load site-specific configuration */ + syslog(LOG_INFO, "Loading citadel.config"); + get_config(); + validate_config(); + + syslog(LOG_INFO, "Acquiring control record"); + get_control(); + put_config(); + + /* Check floor reference counts */ check_ref_counts(); syslog(LOG_INFO, "Creating base rooms (if necessary)\n"); diff --git a/citadel/server_main.c b/citadel/server_main.c index 9837f86e5..bcb55cb70 100644 --- a/citadel/server_main.c +++ b/citadel/server_main.c @@ -202,17 +202,6 @@ int main(int argc, char **argv) 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(); - validate_config(); - - /* get_control() MUST MUST MUST be called BEFORE the databases are opened!! */ - syslog(LOG_INFO, "Acquiring control record"); - get_control(); - - put_config(); - #ifdef HAVE_RUN_DIR /* on some dists rundir gets purged on startup. so we need to recreate it. */ -- 2.30.2