public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Strongswan: preserve PATH

Browse Source
This commit is contained in:
Igor Pashev
2014-12-22 20:20:58 +00:00
parent 2b91b9b594
commit 17d8029150
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/tools/networking/strongswan/updown-path.patch
+26
View File
@@ -0,0 +1,26 @@
Index: strongswan-5.2.1/src/_updown/_updown.in
===================================================================
--- strongswan-5.2.1.orig/src/_updown/_updown.in
+++ strongswan-5.2.1/src/_updown/_updown.in
@@ -125,7 +125,7 @@
#
# define a minimum PATH environment in case it is not set
-PATH="/sbin:/bin:/usr/sbin:/usr/bin:@sbindir@"
+PATH="${PATH:-/sbin:/bin:/usr/sbin:/usr/bin}"
export PATH
# uncomment to log VPN connections
Index: strongswan-5.2.1/src/libcharon/plugins/updown/updown_listener.c
===================================================================
--- strongswan-5.2.1.orig/src/libcharon/plugins/updown/updown_listener.c
+++ strongswan-5.2.1/src/libcharon/plugins/updown/updown_listener.c
@@ -240,6 +240,8 @@ static void invoke_once(private_updown_l
process_t *process;
char *envp[128] = {};
+ push_env(envp, countof(envp), "PATH=%s", getenv("PATH"));
+
me = ike_sa->get_my_host(ike_sa);
other = ike_sa->get_other_host(ike_sa);