summaryrefslogtreecommitdiffstats
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:31:44 -0400
commit6a4ec785e82f1cbd37207318175f7c1a03a06904 (patch)
treedc161e05220ce5ae501f432740551a4887c3ad07
parent704143f525d0570727c751c9f9e6558772828298 (diff)
downloadpfsense-6a4ec785e82f1cbd37207318175f7c1a03a06904.zip
pfsense-6a4ec785e82f1cbd37207318175f7c1a03a06904.tar.gz
Also only add 127.0.0.1 as a DNS server if dnsmasq (DNS Forwarder) is enabled.
-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 957df8a..cdf8b83 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