also check port of dnsmasq/unbound and skip 127.0.0.1 in resolv.conf if

not port 53. Ticket #4022
This commit is contained in:
Chris Buechler 2014-11-19 16:20:31 -06:00
parent 97383d2bda
commit 355c2f8bdb

View File

@ -139,8 +139,8 @@ function system_resolvconf_generate($dynupdate = false) {
$syscfg = $config['system'];
if (((isset($config['dnsmasq']['enable']) && (empty($config['dnsmasq']['interface']) || in_array("lo0", explode(",", $config['dnsmasq']['interface']))))
|| (isset($config['unbound']['enable'])) && (empty($config['unbound']['active_interface']) || in_array("lo0", explode(",", $config['unbound']['active_interface']))))
if (((isset($config['dnsmasq']['enable']) && (!isset($config['dnsmasq']['port'])) || $config['dnsmasq']['port'] == "53" && (empty($config['dnsmasq']['interface']) || in_array("lo0", explode(",", $config['dnsmasq']['interface']))))
|| (isset($config['unbound']['enable'])) && (!isset($config['unbound']['port'])) || $config['unbound']['port'] == "53" && (empty($config['unbound']['active_interface']) || in_array("lo0", explode(",", $config['unbound']['active_interface']))))
&& !isset($config['system']['dnslocalhost']))
$resolvconf .= "nameserver 127.0.0.1\n";