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:08:37 -0400 |
| commit | 68ce71f290ab1fd5f701614c7ee12cbfb2f25d4f (patch) | |
| tree | 0619dec6668bdb510af623f005300478d7617a64 /src | |
| parent | 573c72c24a11ab39123cff67a79e0e89b120c14b (diff) | |
| download | pfsense-68ce71f290ab1fd5f701614c7ee12cbfb2f25d4f.zip pfsense-68ce71f290ab1fd5f701614c7ee12cbfb2f25d4f.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
Diffstat (limited to 'src')
| -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 542ccc7..712d263 100644 --- a/src/etc/inc/services.inc +++ b/src/etc/inc/services.inc @@ -2180,8 +2180,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); |
