get_config() is now called from master_startup() immediately after the databases...

[citadel.git] / citadel / server_main.c

diff --git a/citadel/server_main.c b/citadel/server_main.c
index 9837f86e54c3537e71bc0ee779286d45d3cf88be..bcb55cb7044bcedb40ed1f6faec2420f6a4ad55a 100644 (file)
--- 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. */