From 43b697d875b6eafa922930cecd1f8ff5eb4a6457 Mon Sep 17 00:00:00 2001
From: Daniel Roethlisberger <daniel@roe.ch>
Date: Tue, 15 Mar 2016 19:57:14 +0100
Subject: [PATCH] Initialize proxy before daemonizing

Issue:		#104
---
 main.c  | 12 ------------
 proxy.c |  2 --
 2 files changed, 14 deletions(-)

diff --git a/main.c b/main.c
index d99e6ec..7016856 100644
--- a/main.c
+++ b/main.c
@@ -910,14 +910,12 @@ main(int argc, char *argv[])
 	if (opts->pidfile)
 		close(pidfd);
 
-#if 0
 	/* Initialize proxy before dropping privs */
 	proxy_ctx_t *proxy = proxy_new(opts, clisock[0]);
 	if (!proxy) {
 		log_err_printf("Failed to initialize proxy.\n");
 		exit(EXIT_FAILURE);
 	}
-#endif
 
 	/* Drop privs, chroot */
 	if (sys_privdrop(opts->dropuser, opts->dropgroup,
@@ -944,18 +942,8 @@ main(int argc, char *argv[])
 	}
 	rv = EXIT_SUCCESS;
 
-#if 1
-	proxy_ctx_t *proxy = proxy_new(opts, clisock[0]);
-	if (!proxy) {
-		log_err_printf("Failed to initialize proxy.\n");
-		goto out_proxy_new_failed;
-	}
-#endif
 	proxy_run(proxy);
 	proxy_free(proxy);
-#if 1
-out_proxy_new_failed:
-#endif
 	nat_fini();
 out_nat_failed:
 	cachemgr_fini();
diff --git a/proxy.c b/proxy.c
index 110ca5e..aff810f 100644
--- a/proxy.c
+++ b/proxy.c
@@ -372,11 +372,9 @@ leave0:
 void
 proxy_run(proxy_ctx_t *ctx)
 {
-#if 0
 	if (ctx->opts->detach) {
 		event_reinit(ctx->evbase);
 	}
-#endif
 #ifndef PURIFY
 	if (OPTS_DEBUG(ctx->opts)) {
 		event_base_dump_events(ctx->evbase, stderr);