projects
/
citadel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
More sane behavior on a new installation
[citadel.git]
/
citadel
/
citserver.c
diff --git
a/citadel/citserver.c
b/citadel/citserver.c
index 782f6a99b0c4acf112ef448c0afe25d2400f65d7..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);
syslog(LOG_DEBUG, "master_startup() started\n");
time(&server_startup_time);
+ get_config();
syslog(LOG_INFO, "Opening databases\n");
open_databases();
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");
srandom(seed);
syslog(LOG_INFO, "Initializing ipgm secret\n");
- get_config();
config.c_ipgm_secret = rand();
put_config();
config.c_ipgm_secret = rand();
put_config();