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:38:50 -0200 |
| commit | b3cbb077293ab439b63ef08103dfee4e066b56cd (patch) | |
| tree | b06581ef32a612707fa4ecdd8576c82fded5e151 /etc/inc/pkg-utils.inc | |
| parent | af7a83737e694cff2a8fa41147f99a8a9812ff15 (diff) | |
| download | pfsense-b3cbb077293ab439b63ef08103dfee4e066b56cd.zip pfsense-b3cbb077293ab439b63ef08103dfee4e066b56cd.tar.gz | |
Fix some wrong escapeshellarg() calls
Conflicts:
etc/inc/filter_log.inc
etc/inc/pkg-utils.inc
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 b727abe..59eb28d 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -279,7 +279,7 @@ function is_freebsd_pkg_installed($pkg) { if(!$pkg) return; $output = ""; - 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) { $pkg_name_for_pbi_match = strtolower($pkg) . "-"; 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)) { |
