lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

(dnsmasq) add some missing escapes

Browse Source
This commit is contained in:
Ad Schellevis 2016-05-23 14:58:45 +02:00
parent 91756d8152
commit f57c0f046c
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/etc/inc/services.inc
View File

@ -1839,7 +1839,6 @@ function dyndnsCheckIP($int)
function services_dnsmasq_configure()
{
global $config;
$return = 0;
// hard coded args: will be removed to avoid duplication if specified in custom_options
$standard_args = array(
@ -1935,9 +1934,10 @@ function services_dnsmasq_configure()
/* Setup forwarded domains */
if (isset($config['dnsmasq']['domainoverrides']) && is_array($config['dnsmasq']['domainoverrides'])) {
foreach($config['dnsmasq']['domainoverrides'] as $override) {
if ($override['ip'] == "!")
$override[ip] = "";
$args .= ' --server=/' . $override['domain'] . '/' . $override['ip'];
if ($override['ip'] == "!") {
$override['ip'] = "";
}
$args .= ' --server='. escapeshellarg('/' . $override['domain'] . '/' . $override['ip']);
}
}
@ -1945,7 +1945,7 @@ function services_dnsmasq_configure()
if (isset($config['dnsmasq']['domainoverrides']) && is_array($config['dnsmasq']['domainoverrides'])) {
if (!isset($config['system']['webgui']['nodnsrebindcheck'])) {
foreach($config['dnsmasq']['domainoverrides'] as $override) {
$args .= ' --rebind-domain-ok=/' . $override['domain'] . '/ ';
$args .= ' --rebind-domain-ok=' . escapeshellarg('/'.$override['domain'].'/') . ' ' ;
}
}
}
@ -1975,7 +1975,6 @@ function services_dnsmasq_configure()
/* run dnsmasq */
$cmd = "/usr/local/sbin/dnsmasq --all-servers {$dns_rebind} {$args}";
//log_error("dnsmasq command: {$cmd}");
mwexec_bg($cmd);
system_dhcpleases_configure();
unset($args);
@ -1987,11 +1986,11 @@ function services_dnsmasq_configure()
if (!file_exists("/var/run/booting")) {
if (services_dhcpd_configure()!=0) {
$return = 1;
return 1;
}
}
return $return;
return 0;
}
function services_unbound_configure()