Changeset 889 for trunk/compact-recs.pl

Timestamp:

06/24/25 12:23:01 (7 days ago)

Author:

Kris Deugau

Message:

/trunk

Refine/fix compact-recs.pl handling for %c/%-c templates, which in fact
were not correctly handled with r834

File:

• trunk/compact-recs.pl (modified) (2 diffs)

trunk/compact-recs.pl

@@ -4 +4 @@
 ##
 # $Id$
-# Copyright 2013-2022 Kris Deugau <kdeugau@deepnet.cx>
+# Copyright 2013-2022,2025 Kris Deugau <kdeugau@deepnet.cx>
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -170 +170 @@
       # skip existing template within the new template's range
       next if $val =~ m{/\d+$};
-      DNSDB::_template4_expand(\$cmp, $val, \$cidr);
+      if ($cmp =~ /\%-?c/) {
+        # Determine "nth host" index value of $val for %c and %-c
+        my $possible = new NetAddr::IP $val;
+        my $valindex = $possible - $cidr;
+        $valindex-- if $cmp =~ /\%-c/;
+        DNSDB::_template4_expand(\$cmp, $val, \$cidr, $valindex);
+      } else {
+        DNSDB::_template4_expand(\$cmp, $val, \$cidr);
+      }
       $delsth->execute($id) if $cmp eq $host;
       $delcnt++ if $cmp eq $host;