diff options
| author |  Christian Hesse <mail@eworm.de> | 2022-03-07 22:25:38 +0100 |
|---|---|---|
| committer | Christian Hesse <mail@eworm.de> | 2022-03-07 23:04:23 +0100 |
| commit | e25250e27be6884cfbf4276207b05561ed594b9b (patch) | |
| tree | f401968a06d990222c49c00a4ee9d06d017970dc | |
| parent | b35e39b0facb84b20efe62f7c53cbf3ffc06f887 (diff) | |
hotspot-to-wpa: initialize variables earlier
(cherry picked from commit df0d826999f198c650d50585c72d92ef7eb6a4c3)
| -rw-r--r-- | hotspot-to-wpa | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/hotspot-to-wpa b/hotspot-to-wpa index c40e08a..b307a10 100644 --- a/hotspot-to-wpa +++ b/hotspot-to-wpa @@ -17,8 +17,11 @@ :local MacAddress $"mac-address"; :local UserName $username; :local Date [ / system clock get date ]; -:local Hotspot [ / ip hotspot host get [ find where mac-address=$MacAddress authorized ] server ]; :local UserVal [ / ip hotspot user get [ find where name=$UserName ] ]; +:local UserInfo [ $ParseKeyValueStore ($UserVal->"comment") ]; +:local Hotspot [ / ip hotspot host get [ find where mac-address=$MacAddress authorized ] server ]; +:local Template [ / caps-man access-list get ([ find where disabled \ + comment=("hotspot-to-wpa template " . $Hotspot) ]->0) ]; :if ([ :len [ / caps-man access-list find where comment="--- hotspot-to-wpa above ---" disabled ] ] = 0) do={ / caps-man access-list add comment="--- hotspot-to-wpa above ---" disabled=yes; @@ -28,16 +31,12 @@ $LogPrintExit2 info $0 ("Adding/updating accesslist entry for mac address " . $MacAddress . \ " (user " . $UserName . ").") false; - / caps-man access-list remove [ find where mac-address=$MacAddress comment~"^hotspot-to-wpa: " ]; / caps-man access-list add comment=("hotspot-to-wpa: " . $UserName . ", " . $MacAddress . ", " . $Date) \ mac-address=$MacAddress private-passphrase=($UserVal->"password") ssid-regexp="-wpa\$" place-before=$PlaceBefore; -:local Template [ / caps-man access-list get ([ find where comment=("hotspot-to-wpa template " . $Hotspot) disabled ]->0) ]; -:local UserInfo [ $ParseKeyValueStore ($UserVal->"comment") ]; :local Entry [ / caps-man access-list find where mac-address=$MacAddress \ comment=("hotspot-to-wpa: " . $UserName . ", " . $MacAddress . ", " . $Date) ]; - :local PrivatePassphrase [ $EitherOr ($UserInfo->"private-passphrase") ($Template->"private-passphrase") ]; :if ([ :len $PrivatePassphrase ] > 0) do={ :if ($PrivatePassphrase = "ignore") do={ |