collect-wireless-mac: lease without address should be impossible...

... we need the check for empty hostname, though.

1 files changed, 2 insertions, 5 deletions

diff --git a/collect-wireless-mac.template b/collect-wireless-mac.template
index eba06ad..c7a2e54 100644
--- a/collect-wireless-mac.template
+++ b/collect-wireless-mac.template
@@ -25,18 +25,15 @@ $ScriptLock "collect-wireless-mac%TEMPL%";
   :local Mac [ / %PATH% registration-table get $RegTbl mac-address ];
   :local AccessList ([ / %PATH% access-list find where mac-address=$Mac ]->0);
   :if ([ :len $AccessList ] = 0) do={
-    :local HostName "no dhcp lease";
     :local Address "no dhcp lease";
+    :local HostName "no dhcp lease";
     :local Lease [ / ip dhcp-server lease find where mac-address=$Mac ];
     :if ([ :len $Lease ] > 0) do={
-      :set HostName [ / ip dhcp-server lease get $Lease host-name ];
       :set Address [ / ip dhcp-server lease get $Lease address ];
+      :set HostName [ / ip dhcp-server lease get $Lease host-name ];
       :if ([ :len $HostName ] = 0) do={
         :set HostName "no hostname";
       }
-      :if ([ :len $Address ] = 0) do={
-        :set Address "no address";
-      }
     }
     :local RegEntry [ / %PATH% registration-table find where mac-address=$Mac ];
     :local Interface [ / %PATH% registration-table get $RegEntry interface ];