From 01e3d9eccce7c7e162266def5582eebefd440e1e Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Tue, 17 Sep 2024 08:26:00 +0200
Subject: [PATCH] dhcrelay: *_interfaces() is reserved and should not be used
 here

---
 src/etc/inc/plugins.inc.d/dhcrelay.inc | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/etc/inc/plugins.inc.d/dhcrelay.inc b/src/etc/inc/plugins.inc.d/dhcrelay.inc
index 6f3781c89..5cc2d066e 100644
--- a/src/etc/inc/plugins.inc.d/dhcrelay.inc
+++ b/src/etc/inc/plugins.inc.d/dhcrelay.inc
@@ -39,7 +39,7 @@ function dhcrelay_configure()
 function dhcrelay_run()
 {
     return [
-        'dhcrelay_interfaces' => 'dhcrelay_interfaces',
+        'dhcrelay_interfaces' => 'dhcrelay_bound_interfaces',
     ];
 }
 
@@ -173,7 +173,7 @@ function dhcrelay_configure_do($verbose = false, $id = null)
     service_log("done.\n", $verbose);
 }
 
-function dhcrelay_instances($family = null)
+function dhcrelay_bound_instances($family = null)
 {
     $mdl = new \OPNsense\DHCRelay\DHCRelay();
     $instances = [];
@@ -203,19 +203,21 @@ function dhcrelay_instances($family = null)
     return $instances;
 }
 
-function dhcrelay_interfaces($family = null)
+function dhcrelay_bound_interfaces($family = null)
 {
-    return array_keys(dhcrelay_instances($family));
+    return array_keys(dhcrelay_bound_instances($family));
 }
 
 function dhcrelay_configure_map($verbose = false, $interface_map = null, $family = null)
 {
-    $instances = dhcrelay_instances($family);
+    /* XXX use plugins_argument_map() */
 
     if (empty($interface_map)) {
         return;
     }
 
+    $instances = dhcrelay_bound_instances($family);
+
     foreach (explode(',', $interface_map) as $interface) {
         foreach ($instances[$interface] ?? [] as $id) {
             dhcrelay_configure_do($verbose, $id);