From 8ca95ed86f66d1c779ef06b3ba8b72248d3480af Mon Sep 17 00:00:00 2001
From: jim-p
Date: Tue, 30 Aug 2011 13:32:36 -0400
Subject: Move the option to exclude localhost as a DNS server under System >
General so it is grouped with other system DNS options in a more logical
location.
---
usr/local/www/system.php | 16 ++++++++++++++++
usr/local/www/system_advanced_misc.php | 21 ---------------------
2 files changed, 16 insertions(+), 21 deletions(-)
(limited to 'usr/local')
diff --git a/usr/local/www/system.php b/usr/local/www/system.php
index 5f27f15..2a623d7 100755
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -62,6 +62,8 @@ $pconfig['timeupdateinterval'] = $config['system']['time-update-interval'];
$pconfig['timeservers'] = $config['system']['timeservers'];
$pconfig['theme'] = $config['system']['theme'];
+$pconfig['dnslocalhost'] = isset($config['system']['dnslocalhost']);
+
if (!isset($pconfig['timeupdateinterval']))
$pconfig['timeupdateinterval'] = 300;
if (!$pconfig['timezone'])
@@ -189,6 +191,11 @@ if ($_POST) {
unset($config['system']['dnsallowoverride']);
$config['system']['dnsallowoverride'] = $_POST['dnsallowoverride'] ? true : false;
+ if($_POST['dnslocalhost'] == "yes")
+ $config['system']['dnslocalhost'] = true;
+ else
+ unset($config['system']['dnslocalhost']);
+
/* which interface should the dns servers resolve through? */
for ($dnscounter=1; $dnscounter<5; $dnscounter++) {
$dnsname="dns{$dnscounter}";
@@ -341,6 +348,15 @@ include("head.inc");
"for its own purposes (including the DNS forwarder). " .
"However, they will not be assigned to DHCP and PPTP " .
"VPN clients."), $g['product_name']); ?>
+
+
+ />
+
+ =gettext("Do not use the DNS Forwarder as a DNS server for the firewall"); ?>
+
+
+ =gettext("By default localhost (127.0.0.1) will be used as the first DNS server where the DNS forwarder is enabled, so system can use the DNS forwarder to perform lookups. ".
+ "Checking this box omits localhost from the list of DNS servers."); ?>
- />
-
- =gettext("By default localhost (127.0.0.1) will be used as the first DNS server where the DNS forwarder is enabled, so this system uses the DNS forwarder to perform lookups. ".
- "Checking this box omits localhost from the list of DNS servers."); ?>
-