mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prefer dnsmasq's host overrides when it's enabled. Ticket #5883

Browse Source
This commit is contained in:
Chris Buechler 2016-02-11 17:52:25 -06:00
parent b76fd2a056
commit efebd867ec
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
etc/inc/system.inc
View File

@ -295,10 +295,13 @@ function system_hosts_generate() {
}
$syscfg = $config['system'];
if (isset($config['unbound']) && isset($config['unbound']['enable']))
$dnsmasqcfg = $config['unbound'];
else
// prefer dnsmasq for hosts generation where it's enabled. It relies
// on hosts for name resolution of its overrides, unbound does not.
if (isset($config['dnsmasq']) && isset($config['dnsmasq']['enable'])) {
$dnsmasqcfg = $config['dnsmasq'];
} else {
$dnsmasqcfg = $config['unbound'];
}
$hosts = "127.0.0.1 localhost localhost.{$syscfg['domain']}\n";
$hosts .= "::1 localhost localhost.{$syscfg['domain']}\n";