From 0fe628a62fe1e7b3d1afa20bf235a4dcbdaa44b4 Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Wed, 4 Mar 2015 16:16:18 -0600 Subject: [PATCH] allow enabling Unbound when dnsmasq is enabled, if they're using diff ports. Ticket #4332 --- usr/local/www/services_unbound.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php index 2b943dd157..f33b16c59f 100644 --- a/usr/local/www/services_unbound.php +++ b/usr/local/www/services_unbound.php @@ -110,7 +110,8 @@ if ($_POST) { system_dhcpleases_configure(); } else { if (isset($_POST['enable']) && isset($config['dnsmasq']['enable'])) { - $input_errors[] = "The DNS Forwarder is enabled. Disable it before enabling the DNS Resolver."; + if ($_POST['port'] == $config['dnsmasq']['port']) + $input_errors[] = "The DNS Forwarder is enabled using this port. Choose a non-conflicting port, or disable the DNS Forwarder."; } if (empty($_POST['active_interface'])) {