Initialize proxy before daemonizing

Issue:		#104
pull/13/head
Daniel Roethlisberger 8 years ago
parent b3a3c36b70
commit 43b697d875

@ -910,14 +910,12 @@ main(int argc, char *argv[])
if (opts->pidfile) if (opts->pidfile)
close(pidfd); close(pidfd);
#if 0
/* Initialize proxy before dropping privs */ /* Initialize proxy before dropping privs */
proxy_ctx_t *proxy = proxy_new(opts, clisock[0]); proxy_ctx_t *proxy = proxy_new(opts, clisock[0]);
if (!proxy) { if (!proxy) {
log_err_printf("Failed to initialize proxy.\n"); log_err_printf("Failed to initialize proxy.\n");
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
#endif
/* Drop privs, chroot */ /* Drop privs, chroot */
if (sys_privdrop(opts->dropuser, opts->dropgroup, if (sys_privdrop(opts->dropuser, opts->dropgroup,
@ -944,18 +942,8 @@ main(int argc, char *argv[])
} }
rv = EXIT_SUCCESS; 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_run(proxy);
proxy_free(proxy); proxy_free(proxy);
#if 1
out_proxy_new_failed:
#endif
nat_fini(); nat_fini();
out_nat_failed: out_nat_failed:
cachemgr_fini(); cachemgr_fini();

@ -372,11 +372,9 @@ leave0:
void void
proxy_run(proxy_ctx_t *ctx) proxy_run(proxy_ctx_t *ctx)
{ {
#if 0
if (ctx->opts->detach) { if (ctx->opts->detach) {
event_reinit(ctx->evbase); event_reinit(ctx->evbase);
} }
#endif
#ifndef PURIFY #ifndef PURIFY
if (OPTS_DEBUG(ctx->opts)) { if (OPTS_DEBUG(ctx->opts)) {
event_base_dump_events(ctx->evbase, stderr); event_base_dump_events(ctx->evbase, stderr);

Loading…
Cancel
Save