1 files changed, 12 insertions, 8 deletions
diff --git a/dhcp-to-dns.rsc b/dhcp-to-dns.rsc
index 0ab5e2a..9b94098 100644
--- a/dhcp-to-dns.rsc
+++ b/dhcp-to-dns.rsc
@@ -1,17 +1,18 @@
 #!rsc by RouterOS
 # RouterOS script: dhcp-to-dns
-# Copyright (c) 2013-2024 Christian Hesse <mail@eworm.de>
-# https://git.eworm.de/cgit/routeros-scripts/about/COPYING.md
+# Copyright (c) 2013-2025 Christian Hesse <mail@eworm.de>
+# https://rsc.eworm.de/COPYING.md
 #
 # provides: lease-script, order=20
-# requires RouterOS, version=7.14
+# requires RouterOS, version=7.16
 #
 # check DHCP leases and add/remove/update DNS entries
-# https://git.eworm.de/cgit/routeros-scripts/about/doc/dhcp-to-dns.md
+# https://rsc.eworm.de/doc/dhcp-to-dns.md
 
 :global GlobalFunctionsReady;
 :while ($GlobalFunctionsReady != true) do={ :delay 500ms; }
 
+:local ExitOK false;
 :do {
   :local ScriptName [ :jobname ];
 
@@ -27,6 +28,7 @@
   :global ScriptLock;
 
   :if ([ $ScriptLock $ScriptName 10 ] = false) do={
+    :set ExitOK true;
     :error false;
   }
 
@@ -40,7 +42,7 @@
   }
   :local PlaceBefore ([ /ip/dns/static/find where (name=$CommentString or (comment=$CommentString and name=-)) type=NXDOMAIN disabled ]->0);
 
-  :foreach DnsRecord in=[ /ip/dns/static/find where comment~("^" . $CommentPrefix . "\\b") (!type or type=A) ] do={
+  :foreach DnsRecord in=[ /ip/dns/static/find where comment~("^" . $CommentPrefix . "\\b") type=A ] do={
     :local DnsRecordVal [ /ip/dns/static/get $DnsRecord ];
     :local DnsRecordInfo [ $ParseKeyValueStore ($DnsRecordVal->"comment") ];
     :local MacInServer ($DnsRecordInfo->"macaddress" . " in " . $DnsRecordInfo->"server");
@@ -83,7 +85,7 @@
       :local FullCN ($HostName . "." . $NetDomain);
       :local MacInServer ($LeaseVal->"active-mac-address" . " in " . $LeaseVal->"server");
 
-      :local DnsRecord [ /ip/dns/static/find where comment=$Comment (!type or type=A) ];
+      :local DnsRecord [ /ip/dns/static/find where comment=$Comment type=A ];
       :if ([ :len $DnsRecord ] > 0) do={
         :local DnsRecordVal [ /ip/dns/static/get $DnsRecord ];
 
@@ -116,11 +118,13 @@
         }
       }
 
-      :if ([ :len [ /ip/dns/static/find where name=$FullA (!type or type=A) ] ] > 1) do={
+      :if ([ :len [ /ip/dns/static/find where name=$FullA type=A ] ] > 1) do={
         $LogPrintOnce warning $ScriptName ("The name '" . $FullA . "' appeared in more than one A record!");
       }
     } else={
       $LogPrint debug $ScriptName ("No address available... Ignoring.");
     }
   }
-} on-error={ }
+} on-error={
+  :global ExitError; $ExitError $ExitOK [ :jobname ];
+}