More sane behavior on a new installation

[citadel.git] / citadel / citserver.c

diff --git a/citadel/citserver.c b/citadel/citserver.c
index 2cca2f8db673de07b15a5e1c9fafffb46c632b6e..96eb783fde58126ba9f85dc1fefdfa0fa86b1529 100644 (file)
--- a/citadel/citserver.c
+++ b/citadel/citserver.c
@@ -169,6 +169,7 @@ void master_startup(void) {
        
        syslog(LOG_DEBUG, "master_startup() started\n");
        time(&server_startup_time);
+       get_config();
 
        syslog(LOG_INFO, "Opening databases\n");
        open_databases();
@@ -209,7 +210,6 @@ void master_startup(void) {
        srandom(seed);
 
        syslog(LOG_INFO, "Initializing ipgm secret\n");
-       get_config();
        config.c_ipgm_secret = rand();
        put_config();
 
@@ -346,9 +346,9 @@ void cmd_time(char *argbuf)
    
    /* timezone and daylight global variables are not portable. */
 #ifdef HAVE_STRUCT_TM_TM_GMTOFF
-   cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst);
+   cprintf("%d %ld|%ld|%d|%ld\n", CIT_OK, (long)tv, tmp.tm_gmtoff, tmp.tm_isdst, server_startup_time);
 #else
-   cprintf("%d %ld|%ld|%d\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst);
+   cprintf("%d %ld|%ld|%d|%ld\n", CIT_OK, (long)tv, timezone, tmp.tm_isdst, server_startup_time);
 #endif
 }