diff options
| author | Matthias Andree <mandree@FreeBSD.org> | 2015-06-10 19:18:56 +0000 |
|---|---|---|
| committer | Matthias Andree <mandree@FreeBSD.org> | 2015-06-10 19:18:56 +0000 |
| commit | a155e91284c85b10cff091192d32d87ae4d0f78a (patch) | |
| tree | 5379ff9e8fe36ee95c21fc1a5bb6147225de9a90 /security/openvpn/files/EF3.patch | |
| parent | devel/rubygem-jmespath: create port (diff) | |
Update to new upstream release 2.3.7.
Fixes
PR: 194745
Diffstat (limited to 'security/openvpn/files/EF3.patch')
| -rw-r--r-- | security/openvpn/files/EF3.patch | 38 |
1 files changed, 0 insertions, 38 deletions
diff --git a/security/openvpn/files/EF3.patch b/security/openvpn/files/EF3.patch deleted file mode 100644 index cb261ef90b09..000000000000 --- a/security/openvpn/files/EF3.patch +++ /dev/null @@ -1,38 +0,0 @@ -commit ac1c2f259b44d1229a65a3e639b09d57a4e2a53b -Author: Arne Schwabe <arne@rfc2549.org> -Date: Fri Mar 21 14:18:35 2014 +0100 - - Move the initialization of the environment to the top so c2.es is initialized - - Acked-by: Gert Doering <gert@greenie.muc.de> - 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 <gert@greenie.muc.de> - -diff --git a/src/openvpn/init.c b/src/openvpn/init.c -index 3b72b96..c50b5c2 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) |
