diff options
| author | Luiz Souza <luiz@netgate.com> | 2018-09-14 16:53:59 -0300 |
|---|---|---|
| committer | Luiz Souza <luiz@netgate.com> | 2018-09-14 17:01:31 -0300 |
| commit | f8d1fe02de66c90747d81140856daaef7b70ddd0 (patch) | |
| tree | 48c3a2abf06cef84a65f90e9348558a75fbbf743 | |
| parent | 9a904de82f128db1fac30de549120738ede8a4f0 (diff) | |
| download | pfsense-f8d1fe02de66c90747d81140856daaef7b70ddd0.zip pfsense-f8d1fe02de66c90747d81140856daaef7b70ddd0.tar.gz | |
Filter properly the know variables in loader.conf.
The know variables should be used as prefix not as literals.
(cherry picked from commit 21bacf010021d34012f6869ce1d55268fad7b0ec)
| -rw-r--r-- | src/etc/inc/pfsense-utils.inc | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/etc/inc/pfsense-utils.inc b/src/etc/inc/pfsense-utils.inc index 6dab50f..18ea92a 100644 --- a/src/etc/inc/pfsense-utils.inc +++ b/src/etc/inc/pfsense-utils.inc @@ -1174,8 +1174,15 @@ function load_loader_conf($loader_conf = NULL, $local = false) { if (empty($line)) { continue; } + $skip = false; list($name, $value) = explode('=', $line, 2); - if (!in_array(trim($name), $remove)) { + foreach($remove as $rid => $rkey) { + if (strncasecmp(trim($name), $rkey, strlen($rkey)) != 0) { + $skip = true; + break; + } + } + if (!$skip) { $data[] = $line; } } |
