From: Marko Kreen <markokr@gmail.com>
Date: Tue, 4 Mar 2008 12:47:03 +0000 (+0000)
Subject: move admin-setup after setuid, srandom() after fork()
X-Git-Tag: pgbouncer_1_2_rc2~30
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=15d27240e389df5bf9e57cfc56b230e32fd07a35;p=pgbouncer

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

diff --git a/src/main.c b/src/main.c
index 5fcb5bb..d066ce0 100644
--- 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();