From 60aa553219b289e9d3e4ef7f0bb7db471f45af69 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Wed, 25 Sep 2024 11:01:40 +0200
Subject: hotspot-to-wpa-cleanup: only match access-list with mac-address

---
 hotspot-to-wpa-cleanup.capsman.rsc  | 2 +-
 hotspot-to-wpa-cleanup.template.rsc | 2 +-
 hotspot-to-wpa-cleanup.wifi.rsc     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/hotspot-to-wpa-cleanup.capsman.rsc b/hotspot-to-wpa-cleanup.capsman.rsc
index 29bd48d..45ea72b 100644
--- a/hotspot-to-wpa-cleanup.capsman.rsc
+++ b/hotspot-to-wpa-cleanup.capsman.rsc
@@ -50,7 +50,7 @@
   }
 
   :foreach Client in=[ /caps-man/access-list/find where comment~"^hotspot-to-wpa:" \
-      !(comment~[ /system/clock/get date ]) ] do={
+      !(comment~[ /system/clock/get date ]) mac-address ] do={
     :local ClientVal [ /caps-man/access-list/get $Client ];
     :if ([ :len [ /ip/dhcp-server/lease/find where !dynamic comment~"^hotspot-to-wpa:" \
          mac-address=($ClientVal->"mac-address") ] ] = 0) do={
diff --git a/hotspot-to-wpa-cleanup.template.rsc b/hotspot-to-wpa-cleanup.template.rsc
index 06dd9f0..081f3d0 100644
--- a/hotspot-to-wpa-cleanup.template.rsc
+++ b/hotspot-to-wpa-cleanup.template.rsc
@@ -54,7 +54,7 @@
 
   :foreach Client in=[ /caps-man/access-list/find where comment~"^hotspot-to-wpa:" \
   :foreach Client in=[ /interface/wifi/access-list/find where comment~"^hotspot-to-wpa:" \
-      !(comment~[ /system/clock/get date ]) ] do={
+      !(comment~[ /system/clock/get date ]) mac-address ] do={
     :local ClientVal [ /caps-man/access-list/get $Client ];
     :local ClientVal [ /interface/wifi/access-list/get $Client ];
     :if ([ :len [ /ip/dhcp-server/lease/find where !dynamic comment~"^hotspot-to-wpa:" \
diff --git a/hotspot-to-wpa-cleanup.wifi.rsc b/hotspot-to-wpa-cleanup.wifi.rsc
index 7c74d10..23f773f 100644
--- a/hotspot-to-wpa-cleanup.wifi.rsc
+++ b/hotspot-to-wpa-cleanup.wifi.rsc
@@ -50,7 +50,7 @@
   }
 
   :foreach Client in=[ /interface/wifi/access-list/find where comment~"^hotspot-to-wpa:" \
-      !(comment~[ /system/clock/get date ]) ] do={
+      !(comment~[ /system/clock/get date ]) mac-address ] do={
     :local ClientVal [ /interface/wifi/access-list/get $Client ];
     :if ([ :len [ /ip/dhcp-server/lease/find where !dynamic comment~"^hotspot-to-wpa:" \
          mac-address=($ClientVal->"mac-address") ] ] = 0) do={
-- 
cgit v1.2.3-70-g09d2