From d2a183a7a8ee9af394a3e2bd15656cb6958f8c81 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 13 Jul 2021 09:05:50 +0200
Subject: [PATCH] dhcp: check address family, not track address existence

---
 src/etc/inc/plugins.inc.d/dhcpd.inc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/dhcpd.inc b/src/etc/inc/plugins.inc.d/dhcpd.inc
index e0fdb837d..e94f5d636 100644
--- a/src/etc/inc/plugins.inc.d/dhcpd.inc
+++ b/src/etc/inc/plugins.inc.d/dhcpd.inc
@@ -1922,11 +1922,11 @@ function dhcpd_staticmap($domain_fallback = 'not.found', $ifconfig_details = nul
 
                 // XXX: dhcpdv6 domain entries have been superseded by domainsearchlist,
                 //      for backward compatibilty support both here.
-                if (!empty($ipaddrv6) && !empty($host['domainsearchlist'])) {
+                if ($inet == 6 && !empty($host['domainsearchlist'])) {
                     $domain = $host['domainsearchlist'];
                 } elseif (!empty($host['domain'])) {
                     $domain = $host['domain'];
-                } elseif (!empty($ipaddrv6) && !empty($dhcpifconf['domainsearchlist'])) {
+                } elseif ($inet == 6 && !empty($dhcpifconf['domainsearchlist'])) {
                     $domain = $dhcpifconf['domainsearchlist'];
                 } elseif (!empty($dhcpifconf['domain'])) {
                     $domain = $dhcpifconf['domain'];