From cb20b8c3807cbdd840d4017f466e1e82e3a9b8a5 Mon Sep 17 00:00:00 2001 From: Christian Hesse Date: Mon, 11 Jul 2022 10:39:43 +0200 Subject: daily-psk: properly check for disabled state The property 'disabled' can be undefined, which evaluates to enabled - but is not matched by 'disabled=no'. --- daily-psk.local | 2 +- daily-psk.template | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/daily-psk.local b/daily-psk.local index 23df467..e2a5886 100644 --- a/daily-psk.local +++ b/daily-psk.local @@ -69,7 +69,7 @@ $WaitFullyConnected; $LogPrintExit2 info $0 ("Updating daily PSK for " . $Ssid . " to " . $NewPsk . " (was " . $OldPsk . ")") false; /interface/wireless/access-list/set $AccList private-pre-shared-key=$NewPsk; - :if ([ :len [ /interface/wireless/find where name=$IntName disabled=no ] ] = 1) do={ + :if ([ :len [ /interface/wireless/find where name=$IntName !disabled ] ] = 1) do={ :foreach SeenSsid in=$Seen do={ :if ($SeenSsid = $Ssid) do={ $LogPrintExit2 debug $0 ("Already sent a mail for SSID " . $Ssid . ", skipping.") false; diff --git a/daily-psk.template b/daily-psk.template index aa05748..bd457dc 100644 --- a/daily-psk.template +++ b/daily-psk.template @@ -74,7 +74,7 @@ $WaitFullyConnected; /interface/wireless/access-list/set $AccList private-pre-shared-key=$NewPsk; /caps-man/access-list/set $AccList private-passphrase=$NewPsk; - :if ([ :len [ /interface/wireless/find where name=$IntName disabled=no ] ] = 1) do={ + :if ([ :len [ /interface/wireless/find where name=$IntName !disabled ] ] = 1) do={ :if ([ :len [ /caps-man/interface/find where configuration=$Configuration ] ] > 0) do={ :foreach SeenSsid in=$Seen do={ :if ($SeenSsid = $Ssid) do={ -- cgit v1.2.3-54-g00ecf