const!

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 076f5cee9ba0b7010f04d7c918260036dddde6c3..4a1070b23563876a03ca5b84c10951497888665f 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -1,7 +1,7 @@
 /* 
  * Main source module for the Citadel server
  *
- * Copyright (c) 1987-2015 by the citadel.org team
+ * Copyright (c) 1987-2014 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.
@@ -122,9 +122,11 @@ void master_startup(void) {
        
        syslog(LOG_DEBUG, "master_startup() started\n");
        time(&server_startup_time);
+       get_config();
+       validate_config();
 
        syslog(LOG_INFO, "Checking directory access");
-       if ((pw = getpwuid(ctdluid)) == NULL) {
+       if ((pw = getpwuid(CTDLUID)) == NULL) {
                gid = getgid();
        } else {
                gid = pw->pw_gid;
@@ -136,17 +138,6 @@ void master_startup(void) {
        }
        syslog(LOG_INFO, "Opening databases");
        open_databases();
-
-       /* Load site-specific configuration */
-       syslog(LOG_INFO, "Loading citadel.config");
-       initialize_config_system();
-       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");
@@ -209,9 +200,6 @@ void master_cleanup(int exitcode) {
 
        /* Do system-dependent stuff */
        sysdep_master_cleanup();
-
-       /* Close the configuration system */
-       shutdown_config_system();
        
        /* Close databases */
        syslog(LOG_INFO, "Closing databases\n");