diff options
| author | Renato Botelho <garga@FreeBSD.org> | 2014-02-04 18:14:41 -0200 |
|---|---|---|
| committer | Renato Botelho <garga@FreeBSD.org> | 2014-02-04 18:14:41 -0200 |
| commit | 7b27b18bef4b529fc4aad42d47c861d1cc26b655 (patch) | |
| tree | 2831974f9216122823202f754afcac21e8845d17 /etc/inc/pkg-utils.inc | |
| parent | 7b7ad7f62fe2946ce7521581aac2b2d8387254ad (diff) | |
| download | pfsense-7b27b18bef4b529fc4aad42d47c861d1cc26b655.zip pfsense-7b27b18bef4b529fc4aad42d47c861d1cc26b655.tar.gz | |
Fix some wrong escapeshellarg() calls
Diffstat (limited to 'etc/inc/pkg-utils.inc')
| -rw-r--r-- | etc/inc/pkg-utils.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index b7f39f1..7af4fa0 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -279,7 +279,7 @@ function is_freebsd_pkg_installed($pkg) { return; $output = ""; putenv("PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"); - exec("/usr/local/sbin/pbi_info \"" . escapeshellarg($pkg) . "\"", $output, $retval); + exec("/usr/local/sbin/pbi_info " . escapeshellarg($pkg), $output, $retval); return (intval($retval) == 0); } @@ -861,7 +861,7 @@ function install_package_xml($pkg) { putenv("PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin"); exec("/usr/local/sbin/pbi_info | grep '^{$pkg_name_for_pbi_match}' | xargs /usr/local/sbin/pbi_info | awk '/Prefix/ {print $2}'",$pbidirarray); $pbidir0 = $pbidirarray[0]; - exec("find /usr/local/etc/ -name *.conf | grep '" . escapeshellarg($pkg) . "'",$files); + exec("find /usr/local/etc/ -name *.conf | grep " . escapeshellarg($pkg),$files); foreach($files as $f) { $pbiconf = str_replace('/usr/local',$pbidir0,$f); if(is_file($pbiconf) || is_link($pbiconf)) { |
