diff options
| author | Chris Buechler <cmb@pfsense.org> | 2014-11-19 16:20:31 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2014-11-19 16:20:31 -0600 |
| commit | 355c2f8bdb3e99dab54bc6aef748587365704786 (patch) | |
| tree | 298eef338ac647af97077124a5395c8a4ce89f8c /etc/inc/system.inc | |
| parent | 97383d2bda23b89da93e2cf31827a3b2aefe9246 (diff) | |
| download | pfsense-355c2f8bdb3e99dab54bc6aef748587365704786.zip pfsense-355c2f8bdb3e99dab54bc6aef748587365704786.tar.gz | |
also check port of dnsmasq/unbound and skip 127.0.0.1 in resolv.conf if
not port 53. Ticket #4022
Diffstat (limited to 'etc/inc/system.inc')
| -rw-r--r-- | etc/inc/system.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/etc/inc/system.inc b/etc/inc/system.inc index 9331c1f..babfb46 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -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"; |
