summaryrefslogtreecommitdiffstats
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:10 -0400
commit631c29af5c46bd4859a3a2cf8bffe0ea7fed8580 (patch)
tree88d04c5ab650d4b96c5dfd2452fa0539473206c6
parent01a0385e47787318d95d0428f97183fc4ab22e7d (diff)
downloadpfsense-631c29af5c46bd4859a3a2cf8bffe0ea7fed8580.zip
pfsense-631c29af5c46bd4859a3a2cf8bffe0ea7fed8580.tar.gz
Fix bad escapeshellarg logic on mpd execution
With this change single-quotes are applied in correct places (cherry picked from commit 08cd022545be58a46b860500ff81bbe7438b6304)
-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 472b4b3..8137de9 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -2078,8 +2078,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