summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNewEraCracker <neweracracker@gmail.com>2016-06-15 09:56:20 +0100
committerStephen Beaver <sbeaver@netgate.com>2016-06-22 11:39:20 -0400
commit50264b5847b0640867eb87804b21261554f78a94 (patch)
treee2e6b30cad4d7eb97f65ea326c9d372235cfd25b /src
parent4125445f9821355baafd9b3c55a373d5f806cab5 (diff)
downloadpfsense-50264b5847b0640867eb87804b21261554f78a94.zip
pfsense-50264b5847b0640867eb87804b21261554f78a94.tar.gz
Fix bad escapeshellarg logic on mpd execution
With this change single-quotes are applied in correct places (cherry picked from commit 08cd022545be58a46b860500ff81bbe7438b6304)
Diffstat (limited to 'src')
-rw-r--r--src/etc/inc/interfaces.inc5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 8197fc6..71746b9 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2080,8 +2080,9 @@ EOD;
}
/* fire up mpd */
- mwexec("/usr/local/sbin/mpd5 -b -k -d {$g['varetc_path']} -f mpd_{$interface}.conf -p {$g['varrun_path']}/" .
- escapeshellarg($ppp['type']) . "_{$interface}.pid -s ppp " . escapeshellarg($ppp['type']) . "client");
+ mwexec("/usr/local/sbin/mpd5 -b -k -d {$g['varetc_path']} -f mpd_{$interface}.conf -p " .
+ escapeshellarg("{$g['varrun_path']}/{$ppp['type']}_{$interface}.pid") . " -s ppp " .
+ escapeshellarg("{$ppp['type']}client"));
// Check for PPPoE periodic reset request
if ($type == "pppoe") {
OpenPOWER on IntegriCloud