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:54 -0600 |
| commit | 8106d4467a32b1f19704bad3c928e9fd0282b113 (patch) | |
| tree | 8355cf84d0e7baf20d6ba3d04013f1e82f08d751 /usr/local/www/services_unbound.php | |
| parent | 9bfb45ab2810edd13c3799510f5d090d01f82791 (diff) | |
| download | pfsense-8106d4467a32b1f19704bad3c928e9fd0282b113.zip pfsense-8106d4467a32b1f19704bad3c928e9fd0282b113.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 4e307b3..33dbe46 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'])) { |
