diff options
| author | jim-p <jimp@pfsense.org> | 2016-08-19 10:06:17 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2016-08-19 10:07:14 -0400 |
| commit | a2a3ca3852f5ab229aad1ab701bbcebef6e874a7 (patch) | |
| tree | bc4d6c62e79c77f67120e7c78ccae2e96652f1af | |
| parent | 582b1b92f918b0cc1566bd7cdd7b00022b69b648 (diff) | |
| download | pfsense-a2a3ca3852f5ab229aad1ab701bbcebef6e874a7.zip pfsense-a2a3ca3852f5ab229aad1ab701bbcebef6e874a7.tar.gz | |
Use "-C /dev/null" when starting dnsmasq to avoid it picking up an incorrect default config which would override our command line parameters. Fixes #6730
| -rw-r--r-- | src/etc/inc/services.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/etc/inc/services.inc b/src/etc/inc/services.inc index dbea750..5ac5ac3 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -2186,8 +2186,8 @@ function services_dnsmasq_configure($restart_dhcp = true) { } $args .= ' ' . implode(' ', array_values($standard_args)); - /* run dnsmasq */ - $cmd = "/usr/local/sbin/dnsmasq --all-servers {$dns_rebind} {$args}"; + /* run dnsmasq. Use "-C /dev/null" since we use command line args only (Issue #6730) */ + $cmd = "/usr/local/sbin/dnsmasq --all-servers -C /dev/null {$dns_rebind} {$args}"; //log_error("dnsmasq command: {$cmd}"); mwexec_bg($cmd); unset($args); |
