Changeset 43 for trunk

Timestamp:

12/05/14 18:03:52 (10 years ago)

Author:

Kris Deugau

Message:

/trunk/dnsbl

Regularize a few things that should be configuration in export-dnsbl
Fix a minor glitch in bitmask application in CIDR/rbldnsd mode

File:

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

trunk/dnsbl/export-dnsbl

@@ -70 +70 @@
         ($config{bladmin} ? $config{bladmin} : 'systems.company.com')." 0 1200 600 600 900\n".
         "\$NS 3600 127.0.0.1\n".
-        "\$TTL 900\n";
+        "\$TTL ".($config{ttl} ? $config{ttl} : '900')."\n";
 
   # more or less raw CIDR block-and-IP info.  rbldnsd format for convenience.
   foreach (sort ipcmp keys %iplist) {
     my $entry;
-    if ($iplist{$_} > 256) {
-      if ($iplist{$_} > 65536) {
+    if ($iplist{$_} >= 256) {
+      if ($iplist{$_} >= 65536) {
         $entry .= int($iplist{$_}/65536).".";
         $iplist{$_} = $iplist{$_} % 65536;
@@ -97 +97 @@
   }
 } else {
+  # default "mode";  tinyDNS data format
   foreach (sort ipcmp keys %iplist) {
     my $entry;
@@ -114 +115 @@
     my ($o1,$o2,$o3,$o4) = (/^(\d+)\.([\d*]+)(?:\.([\d*]+)(?:\.([\d*]+))?)?$/);
     print "+".(defined($o4) ? "$o4." : '').(defined($o3) ? "$o3." : '').(defined($o2) ? "$o2." : '').
-        "$o1.spamhosts.company.com:127.0.0.$entry:900:::\n";
+        "$o1.".($config{blzone} ? $config{blzone} : 'spamhosts.company.dnsbl').":127.0.0.$entry:"
+        ($config{ttl} ? $config{ttl} : '900').":::\n";
   }
 }