From e73db9c7aef5cfaf63e1c23637dafa29885ae58b Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Wed, 24 Feb 2021 20:00:34 +0100
Subject: [PATCH] dhcp: remove interface key #4642

At first the idea was to pass it, but especially since this only
passes one entry as noted by @maurice-w it is probably better to
ditch it.  :)
---
 src/etc/inc/plugins.inc.d/dhcpd.inc   | 2 +-
 src/etc/inc/plugins.inc.d/dnsmasq.inc | 4 ++--
 src/etc/inc/plugins.inc.d/unbound.inc | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/dhcpd.inc b/src/etc/inc/plugins.inc.d/dhcpd.inc
index 4ae6712b6..b8d34d6ad 100644
--- a/src/etc/inc/plugins.inc.d/dhcpd.inc
+++ b/src/etc/inc/plugins.inc.d/dhcpd.inc
@@ -1924,7 +1924,7 @@ function dhcpd_staticmap($inet = 4, $domain_fallback = 'not.found', $ifconfig_de
 
             $domain = explode(";", $domain)[0]; // XXX: first entry of domainsearchlist
 
-            $staticmap[$dhcpif] = [
+            $staticmap[] = [
                 'descr' => $host['descr'],
                 'domain' => $domain,
                 'hostname' => $host['hostname'],
diff --git a/src/etc/inc/plugins.inc.d/dnsmasq.inc b/src/etc/inc/plugins.inc.d/dnsmasq.inc
index 2a3da9048..8382d08e6 100644
--- a/src/etc/inc/plugins.inc.d/dnsmasq.inc
+++ b/src/etc/inc/plugins.inc.d/dnsmasq.inc
@@ -233,11 +233,11 @@ function _dnsmasq_add_host_entries()
 
         $ifconfig_details = legacy_interfaces_details();
 
-        foreach (dhcpd_staticmap(4, $domain, $ifconfig_details) as $dhcpif => $host) {
+        foreach (dhcpd_staticmap(4, $domain, $ifconfig_details) as $host) {
             $dhosts .= "{$host['ipaddr']}\t{$host['hostname']}.{$host['domain']} {$host['hostname']}\n";
         }
 
-        foreach (dhcpd_staticmap(6, $domain, $ifconfig_details) as $dhcpif => $host) {
+        foreach (dhcpd_staticmap(6, $domain, $ifconfig_details) as $host) {
             $dhosts .= "{$host['ipaddrv6']}\t{$host['hostname']}.{$host['domain']} {$host['hostname']}\n";
         }
     }
diff --git a/src/etc/inc/plugins.inc.d/unbound.inc b/src/etc/inc/plugins.inc.d/unbound.inc
index 9e2b8d386..4e675f826 100644
--- a/src/etc/inc/plugins.inc.d/unbound.inc
+++ b/src/etc/inc/plugins.inc.d/unbound.inc
@@ -650,7 +650,7 @@ function unbound_add_host_entries($ifconfig_details = null)
     if (isset($config['unbound']['regdhcpstatic'])) {
         require_once 'plugins.inc.d/dhcpd.inc';  /* XXX */
 
-        foreach (dhcpd_staticmap(4, $config['system']['domain'], $ifconfig_details) as $dhcpif => $host) {
+        foreach (dhcpd_staticmap(4, $config['system']['domain'], $ifconfig_details) as $host) {
             $unbound_entries .= "local-data-ptr: \"{$host['ipaddr']} {$host['hostname']}.{$host['domain']}\"\n";
             $unbound_entries .= "local-data: \"{$host['hostname']}.{$host['domain']} IN A {$host['ipaddr']}\"\n";
             if (!empty($host['descr']) && $unboundcfg['txtsupport'] == 'on') {
@@ -658,7 +658,7 @@ function unbound_add_host_entries($ifconfig_details = null)
             }
         }
 
-        foreach (dhcpd_staticmap(6, $config['system']['domain'], $ifconfig_details) as $dhcpif => $host) {
+        foreach (dhcpd_staticmap(6, $config['system']['domain'], $ifconfig_details) as $host) {
             $unbound_entries .= "local-data-ptr: \"{$host['ipaddrv6']} {$host['hostname']}.{$host['domain']}\"\n";
             $unbound_entries .= "local-data: \"{$host['hostname']}.{$host['domain']} IN AAAA {$host['ipaddrv6']}\"\n";
             if (!empty($host['descr']) && $unboundcfg['txtsupport'] == 'on') {