From: Arne Schwabe Date: Fri, 21 Mar 2014 13:18:35 +0000 (+0100) Subject: Move the initialization of the environment to the top so c2.es is initialized X-Git-Tag: v2.4_alpha1~469 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac1c2f259b44d1229a65a3e639b09d57a4e2a53b;p=thirdparty%2Fopenvpn.git Move the initialization of the environment to the top so c2.es is initialized Acked-by: Gert Doering Message-Id: <1395407925-25518-3-git-send-email-arne@rfc2549.org> URL: http://article.gmane.org/gmane.network.openvpn.devel/8372 Signed-off-by: Gert Doering --- diff --git a/src/openvpn/init.c b/src/openvpn/init.c index 3b72b9644..c50b5c260 100644 --- a/src/openvpn/init.c +++ b/src/openvpn/init.c @@ -3339,6 +3339,10 @@ init_instance (struct context *c, const struct env_set *env, const unsigned int /* init garbage collection level */ gc_init (&c->c2.gc); + /* inherit environmental variables */ + if (env) + do_inherit_env (c, env); + /* signals caught here will abort */ c->sig->signal_received = 0; c->sig->signal_text = NULL; @@ -3390,10 +3394,6 @@ init_instance (struct context *c, const struct env_set *env, const unsigned int if (c->mode == CM_P2P || c->mode == CM_TOP) do_option_warnings (c); - /* inherit environmental variables */ - if (env) - do_inherit_env (c, env); - #ifdef ENABLE_PLUGIN /* initialize plugins */ if (c->mode == CM_P2P || c->mode == CM_TOP)