diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-03-04 16:16:18 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-03-04 16:16:18 -0600 |
| commit | 0fe628a62fe1e7b3d1afa20bf235a4dcbdaa44b4 (patch) | |
| tree | bb4a59637c15ccd8e5003d8922a7209150c4c325 /usr/local/www/services_unbound.php | |
| parent | 7df02c1e87e01af923fe57d2ab8a83f9cfb74881 (diff) | |
| download | pfsense-0fe628a62fe1e7b3d1afa20bf235a4dcbdaa44b4.zip pfsense-0fe628a62fe1e7b3d1afa20bf235a4dcbdaa44b4.tar.gz | |
allow enabling Unbound when dnsmasq is enabled, if they're using diff
ports. Ticket #4332
Diffstat (limited to 'usr/local/www/services_unbound.php')
| -rw-r--r-- | usr/local/www/services_unbound.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/usr/local/www/services_unbound.php b/usr/local/www/services_unbound.php index 2b943dd..f33b16c 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'])) { |
