diff options
| author | Chris Buechler <cmb@pfsense.org> | 2015-02-11 01:13:17 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2015-02-11 01:14:53 -0600 |
| commit | 24cbfd5a63dd86707a565a3e975616ff9fec2ebd (patch) | |
| tree | 0012bad8daa255c2f13e24f1ef52dd22bf30636b /usr/local/www/services_dnsmasq.php | |
| parent | 1ee360aaa9176d3287a7099abd47f95c4464ac23 (diff) | |
| download | pfsense-24cbfd5a63dd86707a565a3e975616ff9fec2ebd.zip pfsense-24cbfd5a63dd86707a565a3e975616ff9fec2ebd.tar.gz | |
Check if Unbound is enabled and using the same port before allowing dnsmasq to be enabled. part of Ticket #4332
Diffstat (limited to 'usr/local/www/services_dnsmasq.php')
| -rw-r--r-- | usr/local/www/services_dnsmasq.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php index 0361932..0acb961 100644 --- a/usr/local/www/services_dnsmasq.php +++ b/usr/local/www/services_dnsmasq.php @@ -87,6 +87,11 @@ if ($_POST) { $config['dnsmasq']['custom_options'] = str_replace("\r\n", "\n", $_POST['custom_options']); $config['dnsmasq']['strictbind'] = ($_POST['strictbind']) ? true : false; + if (isset($_POST['enable']) && isset($config['unbound']['enable'])) { + if ($_POST['port'] == $config['unbound']['port']) + $input_errors[] = "The DNS Resolver is enabled using this port. Choose a non-conflicting port, or disable DNS Resolver."; + } + if ($_POST['port']) if(is_port($_POST['port'])) $config['dnsmasq']['port'] = $_POST['port']; |
