From efebd867ec266120cc682e20bae15b38cae6c04a Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Thu, 11 Feb 2016 17:52:25 -0600 Subject: [PATCH] Prefer dnsmasq's host overrides when it's enabled. Ticket #5883 --- etc/inc/system.inc | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/etc/inc/system.inc b/etc/inc/system.inc index ba47740339..b0196c3cdb 100644 --- a/etc/inc/system.inc +++ b/etc/inc/system.inc @@ -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";