From 8e12453058ae848a6d61c104ab6aa22902205d98 Mon Sep 17 00:00:00 2001
From: Christian Hesse <mail@eworm.de>
Date: Fri, 6 Dec 2024 10:31:52 +0100
Subject: hotspot-to-wpa: use $ExitError to indicate unintentional error

---
 hotspot-to-wpa.wifi.rsc | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'hotspot-to-wpa.wifi.rsc')

diff --git a/hotspot-to-wpa.wifi.rsc b/hotspot-to-wpa.wifi.rsc
index 25933c6..6242d04 100644
--- a/hotspot-to-wpa.wifi.rsc
+++ b/hotspot-to-wpa.wifi.rsc
@@ -13,6 +13,7 @@
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
+:local ExitOK false;
 :do {
   :local ScriptName [ :jobname ];
 
@@ -25,11 +26,13 @@
   :local UserName $username;
 
   :if ([ $ScriptLock $ScriptName ] = false) do={
+    :set ExitOK true;
     :error false;
   }
 
   :if ([ :typeof $MacAddress ] = "nothing" || [ :typeof $UserName ] = "nothing") do={
     $LogPrint error $ScriptName ("This script is supposed to run from hotspot on login.");
+    :set ExitOK true;
     :error false;
   }
 
@@ -57,6 +60,7 @@
 
   :if ($Template->"action" = "reject") do={
     $LogPrint info $ScriptName ("Ignoring login for hotspot '" . $Hotspot . "'.");
+    :set ExitOK true;
     :error true;
   }
 
@@ -92,4 +96,6 @@
 
   :delay 2s;
   /interface/wifi/access-list/set $Entry action=accept;
-} on-error={ }
+} on-error={
+  :global ExitError; $ExitError $ExitOK [ :jobname ];
+}
-- 
cgit v1.2.3-70-g09d2