summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorjim-p <jimp@pfsense.org>2011-08-12 10:31:44 -0400
committerjim-p <jimp@pfsense.org>2011-08-12 10:32:16 -0400
commitaf6576a89c0daef76f0c1e1d184a5ac984d1f2bc (patch)
tree1bd034a706154bc4e01b372e440fdcdc73127e1b /etc
parent37f33271be08992d0f55b71d4e492d5d2b880641 (diff)
downloadpfsense-af6576a89c0daef76f0c1e1d184a5ac984d1f2bc.zip
pfsense-af6576a89c0daef76f0c1e1d184a5ac984d1f2bc.tar.gz
Also only add 127.0.0.1 as a DNS server if dnsmasq (DNS Forwarder) is enabled.
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/system.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc
index aad98e4..7779fde 100644
--- a/etc/inc/system.inc
+++ b/etc/inc/system.inc
@@ -90,7 +90,7 @@ function system_resolvconf_generate($dynupdate = false) {
if($syscfg['domain'])
$resolvconf = "domain {$syscfg['domain']}\n";
- if (!isset($config['system']['dnslocalhost']))
+ if (isset($config['dnsmasq']['enable']) && !isset($config['system']['dnslocalhost']))
$resolvconf .= "nameserver 127.0.0.1\n";
if (isset($syscfg['dnsallowoverride'])) {
OpenPOWER on IntegriCloud