move admin-setup after setuid, srandom() after fork()

diff --git a/src/main.c b/src/main.c
index 5fcb5bbb69f6e76d229d5bda496f92268c4efbba..d066ce0c9cbf3b175da819d974746e453fba597b 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -602,7 +602,6 @@ int main(int argc, char *argv[])
        init_objects();
        load_config(false);
        init_caches();
-       admin_setup();
 
        /* prefer cmdline over config for username */
        if (arg_username)
@@ -619,8 +618,7 @@ int main(int argc, char *argv[])
        /* need to do that after loading config */
        check_limits();
 
-       /* init random */
-       srandom(time(NULL) ^ getpid());
+       admin_setup();
 
        if (cf_reboot) {
                if (check_old_process_unix()) {
@@ -640,6 +638,10 @@ int main(int argc, char *argv[])
        /* initialize subsystems, order important */
        if (cf_daemon)
                go_daemon();
+
+       /* init random */
+       srandom(time(NULL) ^ getpid());
+
        event_init();
        signal_setup();
        janitor_setup();