Handle zero-length legacy netconfig files correctly (just delete them)

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index ce562ccdbba6953e58636d589e446044101d93d4..9832b781276932dbab8d01c4bee2e1ae96c4effc 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -138,13 +138,10 @@ void master_startup(void) {
        open_databases();
 
        /* Load site-specific configuration */
-       syslog(LOG_INFO, "Loading citadel.config");
+       syslog(LOG_INFO, "Initializing configuration system");
        initialize_config_system();
        validate_config();
-
-       syslog(LOG_INFO, "Acquiring control record");
-       get_control();
-       put_config();
+       migrate_legacy_control_record();
 
        /* Check floor reference counts */
        check_ref_counts();
@@ -183,8 +180,6 @@ void master_startup(void) {
        srand(seed);
        srandom(seed);
 
-       put_config();
-
        syslog(LOG_DEBUG, "master_startup() finished\n");
 }
 
@@ -226,8 +221,6 @@ void master_cleanup(int exitcode) {
                }
        }
        
-       release_control();
-
        /* Now go away. */
        syslog(LOG_NOTICE, "citserver: Exiting with status %d\n", exitcode);
        fflush(stdout); fflush(stderr);