From b53fe7c1d9dd9c217b704f8a895c099e6179bee1 Mon Sep 17 00:00:00 2001
From: Franco Fichtner <franco@opnsense.org>
Date: Fri, 5 Apr 2024 12:06:31 +0200
Subject: [PATCH] dhcpd: make private consumers actually private where it
 matters

---
 src/opnsense/scripts/dhcp/prefixes.php                  | 2 +-
 src/opnsense/service/conf/actions.d/actions_dhcpd.conf  | 2 +-
 src/opnsense/service/conf/actions.d/actions_dhcpd6.conf | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/opnsense/scripts/dhcp/prefixes.php b/src/opnsense/scripts/dhcp/prefixes.php
index a0d9db274..d92ae7d50 100755
--- a/src/opnsense/scripts/dhcp/prefixes.php
+++ b/src/opnsense/scripts/dhcp/prefixes.php
@@ -75,7 +75,7 @@ foreach (new SplFileObject($leases_file) as $line) {
 }
 
 /* since a route requires a gateway address try to derive it from static mapping as well */
-foreach (plugins_run('static_mapping') as $map) {
+foreach (plugins_run('static_mapping:dhcpd') as $map) {
     foreach ($map as $host) {
         if (empty($host['duid'])) {
             continue;
diff --git a/src/opnsense/service/conf/actions.d/actions_dhcpd.conf b/src/opnsense/service/conf/actions.d/actions_dhcpd.conf
index 5ced558ac..00ec71db8 100644
--- a/src/opnsense/service/conf/actions.d/actions_dhcpd.conf
+++ b/src/opnsense/service/conf/actions.d/actions_dhcpd.conf
@@ -11,7 +11,7 @@ type:script_output
 message:list arp table
 
 [list.static]
-command:/usr/local/sbin/pluginctl -r static_mapping 4
+command:/usr/local/sbin/pluginctl -r static_mapping:dhcpd 4
 parameters:%s
 type:script_output
 message: list dhcp static mappings %s
diff --git a/src/opnsense/service/conf/actions.d/actions_dhcpd6.conf b/src/opnsense/service/conf/actions.d/actions_dhcpd6.conf
index a6e24ab56..6dbcbc49f 100644
--- a/src/opnsense/service/conf/actions.d/actions_dhcpd6.conf
+++ b/src/opnsense/service/conf/actions.d/actions_dhcpd6.conf
@@ -5,7 +5,7 @@ type:script_output
 message:list dhcpv6 leases %s
 
 [list.static]
-command:/usr/local/sbin/pluginctl -r static_mapping 6
+command:/usr/local/sbin/pluginctl -r static_mapping:dhcpd 6
 parameters:%s
 type:script_output
 message: list dhcpv6 static mappings %s