diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-03-14 11:08:43 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2016-03-14 11:09:04 +0000 |
| commit | 8cbbb1cc063e37caa502d6b543079898eb40acd1 (patch) | |
| tree | bdb206041e54adc329f222c843a03ee7e3047682 /main/openrc/fix-rc_env_allow.patch | |
| parent | 7c18b536e1c1329ab8466eb402c956ebfff315ba (diff) | |
| download | aports-8cbbb1cc063e37caa502d6b543079898eb40acd1.tar.bz2 aports-8cbbb1cc063e37caa502d6b543079898eb40acd1.tar.xz | |
main/openrc: backport rc_env_allow fix
Diffstat (limited to 'main/openrc/fix-rc_env_allow.patch')
| -rw-r--r-- | main/openrc/fix-rc_env_allow.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/main/openrc/fix-rc_env_allow.patch b/main/openrc/fix-rc_env_allow.patch new file mode 100644 index 0000000000..f3b89c5aec --- /dev/null +++ b/main/openrc/fix-rc_env_allow.patch @@ -0,0 +1,29 @@ +From 7eaf71176b87ae69bfa622aa621341a19a9d32b0 Mon Sep 17 00:00:00 2001 +From: William Hubbs <w.d.hubbs@gmail.com> +Date: Fri, 12 Feb 2016 12:40:55 -0600 +Subject: [PATCH] Fix rc_env_allow wildcard usage + +Before this commit, using * in rc_env_allow did not work. + +This fixes #60. +--- + src/rc/rc-misc.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/src/rc/rc-misc.c b/src/rc/rc-misc.c +index f2967dd..82f1b78 100644 +--- a/src/rc/rc-misc.c ++++ b/src/rc/rc-misc.c +@@ -68,6 +68,12 @@ env_filter(void) + + /* Add the user defined list of vars */ + env_allow = rc_stringlist_split(rc_conf_value("rc_env_allow"), " "); ++ /* ++ * If '*' is an entry in rc_env_allow, do nothing as we are to pass ++ * through all environment variables. ++ */ ++ if (rc_stringlist_find(env_allow, "*")) ++ return; + profile = rc_config_load(RC_PROFILE_ENV); + + /* Copy the env and work from this so we can manipulate it safely */ |