From b25727a11b2dcfcabaaa9b1db42e6566d3dfe53d Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Mon, 22 Feb 2021 14:53:07 +0100
Subject: [PATCH] dnsmasq|unbound: align the code, also fix Dnsmasq #4642

---
 src/etc/inc/plugins.inc.d/dnsmasq.inc | 13 +++++++++++--
 src/etc/inc/plugins.inc.d/unbound.inc | 15 +++++++++------
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/dnsmasq.inc b/src/etc/inc/plugins.inc.d/dnsmasq.inc
index d41c1779a..2ef5e17ee 100644
--- a/src/etc/inc/plugins.inc.d/dnsmasq.inc
+++ b/src/etc/inc/plugins.inc.d/dnsmasq.inc
@@ -227,7 +227,7 @@ function _dnsmasq_add_host_entries()
         foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) {
             if (isset($dhcpifconf['staticmap']) && isset($dhcpifconf['enable'])) {
                 foreach ($dhcpifconf['staticmap'] as $host) {
-                    if (!$host['ipaddr'] || !$host['hostname']) {
+                    if (empty($host['ipaddr']) || empty($host['hostname'])) {
                         continue;
                     }
 
@@ -248,12 +248,21 @@ function _dnsmasq_add_host_entries()
     }
 
     if (isset($dnsmasqcfg['regdhcpstatic']) && is_array($config['dhcpdv6'])) {
+        $ifconfig_details = legacy_interfaces_details();
+
         foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) {
             if (isset($dhcpifconf['staticmap']) && isset($dhcpifconf['enable'])) {
+                list ($ipaddrv6) = isset($dhcpifconf['dhcpd6track6allowoverride']) ?
+                    interfaces_primary_address6($dhcpif, null, $ifconfig_details) : [null];
                 foreach ($dhcpifconf['staticmap'] as $host) {
-                    if (!$host['ipaddrv6'] || !$host['hostname']) {
+                    if (empty($host['ipaddrv6']) || empty($host['hostname'])) {
                         continue;
                     }
+
+                    if (!empty($ipaddrv6)) {
+                        $host['ipaddrv6'] = make_ipv6_64_address($ipaddrv6, $host['ipaddrv6']);
+                    }
+
                     // XXX: dhcpdv6 domain entries have been superseded by domainsearchlist,
                     //      for backward compatibilty support both here.
                     if (!empty($host['domainsearchlist'])) {
diff --git a/src/etc/inc/plugins.inc.d/unbound.inc b/src/etc/inc/plugins.inc.d/unbound.inc
index d3cbb3435..4ed2260c2 100644
--- a/src/etc/inc/plugins.inc.d/unbound.inc
+++ b/src/etc/inc/plugins.inc.d/unbound.inc
@@ -189,7 +189,7 @@ EOF;
         }
     } else {
         $bindints .= "interface: 0.0.0.0\n";
-        $bindints .= "interface: ::0\n";
+        $bindints .= "interface: ::\n";
         $bindints .= "interface-automatic: yes\n";
     }
 
@@ -651,15 +651,16 @@ function unbound_add_host_entries($ifconfig_details = null)
         foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) {
             if (isset($dhcpifconf['staticmap']) && isset($dhcpifconf['enable'])) {
                 foreach ($dhcpifconf['staticmap'] as $host) {
-                    if (!$host['ipaddr'] || !$host['hostname']) {
+                    if (empty($host['ipaddr']) || empty($host['hostname'])) {
                         continue;
                     }
 
-                    $domain = $config['system']['domain'];
                     if ($host['domain']) {
                         $domain = $host['domain'];
                     } elseif ($dhcpifconf['domain']) {
                         $domain = $dhcpifconf['domain'];
+                    } else {
+                        $domain = $config['system']['domain'];
                     }
 
                     $unbound_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['hostname']}.{$domain}\"\n";
@@ -674,9 +675,9 @@ function unbound_add_host_entries($ifconfig_details = null)
 
     if (isset($config['unbound']['regdhcpstatic']) && is_array($config['dhcpdv6'])) {
         foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) {
-            list ($ipaddrv6) = isset($dhcpifconf['dhcpd6track6allowoverride']) ?
-                interfaces_primary_address6($dhcpif, null, $ifconfig_details) : [null];
             if (isset($dhcpifconf['staticmap']) && isset($dhcpifconf['enable'])) {
+                list ($ipaddrv6) = isset($dhcpifconf['dhcpd6track6allowoverride']) ?
+                    interfaces_primary_address6($dhcpif, null, $ifconfig_details) : [null];
                 foreach ($dhcpifconf['staticmap'] as $host) {
                     if (empty($host['ipaddrv6']) || empty($host['hostname'])) {
                         continue;
@@ -686,7 +687,6 @@ function unbound_add_host_entries($ifconfig_details = null)
                         $host['ipaddrv6'] = make_ipv6_64_address($ipaddrv6, $host['ipaddrv6']);
                     }
 
-                    $domain = $config['system']['domain'];
                     // XXX: dhcpdv6 domain entries have been superseded by domainsearchlist,
                     //      for backward compatibilty support both here.
                     if (!empty($host['domainsearchlist'])) {
@@ -697,7 +697,10 @@ function unbound_add_host_entries($ifconfig_details = null)
                         $domain = $dhcpifconf['domainsearchlist'];
                     } elseif (!empty($dhcpifconf['domain'])) {
                         $domain = $dhcpifconf['domain'];
+                    } else {
+                        $domain = $config['system']['domain'];
                     }
+
                     $domain = explode(";", $domain)[0]; // XXX: first entry of domainsearchlist
                     $unbound_entries .= "local-data-ptr: \"{$host['ipaddrv6']} {$host['hostname']}.{$domain}\"\n";
                     $unbound_entries .= "local-data: \"{$host['hostname']}.{$domain} IN AAAA {$host['ipaddrv6']}\"\n";