Changeset 74

Timestamp:

09/08/25 17:29:04 (8 weeks ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Fix two minor bugs in export-dnsbl's tinydns output:

• Handle whitelisted IPs/blocks returned from DNSDB::export()
• Correctly output valid IPs for all supported bitmask lengths

File:

• trunk/dnsbl/export-dnsbl (modified) (2 diffs)

trunk/dnsbl/export-dnsbl

@@ -102 +102 @@
   # default "mode";  tinyDNS data format
   foreach (sort ipcmp keys %iplist) {
+    next if $iplist{$_} == -1; # whitelisted IP or block
     my $entry;
     if ($iplist{$_} > 256) {
@@ -118 +119 @@
     my ($o1,$o2,$o3,$o4) = (/^(\d+)\.([\d*]+)(?:\.([\d*]+)(?:\.([\d*]+))?)?$/);
     print "+".(defined($o4) ? "$o4." : '').(defined($o3) ? "$o3." : '').(defined($o2) ? "$o2." : '').
-        "$o1.".($config{blzone} ? $config{blzone} : 'spamhosts.company.dnsbl').":127.0.0.$entry:".
+        "$o1.".($config{blzone} ? $config{blzone} : 'spamhosts.company.dnsbl').":127.$entry:".
         ($config{ttl} ? $config{ttl} : '900').":::\n";
   }