From 80e4bec768ddc22965669cc5b60108210ce698ab Mon Sep 17 00:00:00 2001
From: Stephan de Wit <stephan.de.wit@deciso.com>
Date: Thu, 10 Aug 2023 14:34:04 +0200
Subject: [PATCH] dhcpd: staticmap output does not contain device names

---
 .../app/controllers/OPNsense/DHCPv4/Api/LeasesController.php  | 4 ++--
 .../app/controllers/OPNsense/DHCPv6/Api/LeasesController.php  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php
index 52c548c17..77b2212f7 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv4/Api/LeasesController.php
@@ -151,8 +151,8 @@ class LeasesController extends ApiControllerBase
 
             if (!empty($lease['if'])) {
                 /* interface already included */
-                $intf = $lease['if'];
-                $intf_descr = $if_map[strtoupper($intf)];
+                $intf = array_search(strtoupper($lease['if']), $if_map);
+                $intf_descr = $if_map[$intf];
             } else {
                 /* interface not known, check range */
                 foreach ($ip_ranges as $cidr => $if_dev) {
diff --git a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php
index 2db649910..65c57298a 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php
+++ b/src/opnsense/mvc/app/controllers/OPNsense/DHCPv6/Api/LeasesController.php
@@ -194,8 +194,8 @@ class LeasesController extends ApiControllerBase
             $intf = '';
             $intf_descr = '';
             if (!empty($lease['if'])) {
-                $intf = $lease['if'];
-                $intf_descr = $if_map[strtoupper($intf)];
+                $intf = array_search(strtoupper($lease['if']), $if_map);;
+                $intf_descr = $if_map[$intf];
             } else {
                 foreach ($ip_ranges as $cidr => $if) {
                     if (!empty($lease['address']) && Util::isIPInCIDR($lease['address'], $cidr)) {