From bd5737dc22b0e52a52e84fc2d9d1193deb43811d Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Wed, 23 Apr 2014 10:14:59 -0400
Subject: Make sure that the DNS Forwarder/Resolver is actually capable of
 accepting queries on localhost before using it as a DNS server.

---
 usr/local/www/services_dnsmasq.php | 2 ++
 usr/local/www/services_unbound.php | 2 ++
 usr/local/www/system.php           | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'usr')

diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php
index 75c1a8e..4033911 100644
--- a/usr/local/www/services_dnsmasq.php
+++ b/usr/local/www/services_dnsmasq.php
@@ -116,6 +116,8 @@ if ($_POST) {
 
 		// Relaod filter (we might need to sync to CARP hosts)
 		filter_configure();
+		/* Update resolv.conf in case the interface bindings exclude localhost. */
+		system_resolvconf_generate();
 
 		if ($retval == 0)
 			clear_subsystem_dirty('hosts');
diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php
index a6a61aa..08a2e6e 100644
--- a/usr/local/www/services_unbound.php
+++ b/usr/local/www/services_unbound.php
@@ -110,6 +110,8 @@ if ($_POST) {
 		$savemsg = get_std_save_message($retval);
 		if ($retval == 0)
 			clear_subsystem_dirty('unbound');
+		/* Update resolv.conf in case the interface bindings exclude localhost. */
+		system_resolvconf_generate();
 	}
 }
 
diff --git a/usr/local/www/system.php b/usr/local/www/system.php
index be5446e..a5e2b17 100644
--- a/usr/local/www/system.php
+++ b/usr/local/www/system.php
@@ -402,7 +402,7 @@ include("head.inc");
 								<?=gettext("Do not use the DNS Forwarder as a DNS server for the firewall"); ?>
 							</strong>
 							<br />
-							<?=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. ".
+							<?=gettext("By default localhost (127.0.0.1) will be used as the first DNS server where the DNS Forwarder or DNS Resolver is enabled and set to listen on Localhost, so system can use the local DNS service to perform lookups. ".
 							"Checking this box omits localhost from the list of DNS servers."); ?>
 						</span>
 				</td>
-- 
cgit v1.1