Changeset 809

Timestamp:

11/24/20 17:11:26 (3 years ago)

Author:

Kris Deugau

Message:

/trunk

Second sampled historic iteration of bind-import

File:

• trunk/bind-import (modified) (3 diffs)

trunk/bind-import

@@ -33 +33 @@
 my $zid;
 
-if ($zname =~ /\.arpa$/ || $zname =~ m,^[\d./]+$,) {
+if ($zname =~ /\.arpa\.?$/ || $zname =~ m,^[\d./]+$,) {
   $rev = 'y';
-  $zname = _zone2cidr($zname) if $zname =~ /\.arpa$/;
+  $zname = _zone2cidr($zname) if $zname =~ /\.arpa\.?$/;
   $zid = $dnsdb->revID($zname,':ANY:');
+  if ($zid) {
+    $zname = new NetAddr::IP $zname;
+    $zname = DNSDB::_ZONE($zname, 'ZONE', 'r', '.').($zname->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
+  }
 } else {
   $zid = $dnsdb->domainID($zname,':ANY:');
@@ -50 +54 @@
   next if /^\s*;/;
   my ($name) = /([\w_.-]+)\s/;
+  # append zone name to record name if missing AND not dot-terminated;
+  # this happens automagically for forward zones, but not reverse because Reasons.  (fixme?)
+  # suck up and deal with the error if the dot-termiated name is out of zone;  should be
+  # impossible with valid BIND zone file but...
+  $name .= ".$zname" if $name !~ /$zname$/ && $zname !~ /\.$/;
   s/([\w_.-]+)\s+//;
   my ($class) = /(IN|CS|CH|HS)\s/;
@@ -90 +99 @@
 #;imap   IN      900     CNAME   deepnet.cx.
 ##fixme:  not sure how to handle the case where someone leaves off the class.
-  my ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$name, \$itype, \$rdata, $ttl);
+  my ($code, $msg);
+  if ($rev eq 'n') {
+    ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$name, \$itype, \$rdata, $ttl);
+  } else {
+    ($code,$msg) = $dnsdb->addRec('n', $rev, $zid, \$rdata, \$itype, \$name, $ttl);
+  }
   print "$code: $msg\n";
 }