[Openvpn-devel] [PATCH 14/14] Move the initialization of the environment to the top so c2.es is initialized

[Arne Schwabe]

---
 src/openvpn/init.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/openvpn/init.c b/src/openvpn/init.c
index c54907c..e4f6af9 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)
-- 
1.7.9.5