Changeset 360 for trunk

Timestamp:

07/09/12 17:51:58 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Checkpoint on tiny-import.pl

• Handle wildcards sanely in the records that usefully support them. (mostly)
• Handle TXT records in reverse zones
• Properly put AAAA records in forward zones, not reverse zones

File:

• trunk/tiny-import.pl (modified) (8 diffs)

trunk/tiny-import.pl

@@ -125 +125 @@
     my $nodefer = shift || 0;
 
+    $errstr = $rec;  # this way at least we have some idea what went <splat>
+
     if ($rec =~ /^=/) {
       $cnt{APTR}++;
@@ -155 +157 @@
       $host =~ s/^C//;
       $host =~ s/\.$//;
+      $host =~ s/^\\052/*/;
       $ttl = 0 if !$ttl;
       $stamp = '' if !$stamp;
@@ -249 +252 @@
       $host =~ s/^\+//;
       $host =~ s/\.$//;
+      $host =~ s/^\\052/*/;
       $ttl = 0 if !$ttl;
       $stamp = '' if !$stamp;
@@ -290 +294 @@
       $zone =~ s/^\@//;
       $zone =~ s/\.$//;
+      $zone =~ s/^\\052/*/;
       $host =~ s/\.$//;
       $host = "$host.mx.$zone" if $host !~ /\./;
@@ -314 +319 @@
       my ($fqdn, $rdata, $ttl, $stamp, $loc) = split /:/, $rec, 5;
       $fqdn =~ s/^'//;
+      $fqdn =~ s/^\\052/*/;
       _deoctal(\$rdata);
       $ttl = 0 if !$ttl;
@@ -320 +326 @@
       $loc = '' if $loc =~ /^:+$/;
 
-      my $domid = DNSDB::_hostparent($dbh, $fqdn);
-      if ($domid) {
-        $recsth->execute($domid, 0, $fqdn, 16, $rdata, 0, 0, 0, $ttl);
-      } else {
-        push @deferred, $rec unless $nodefer;
+      if ($fqdn =~ /\.arpa$/) {
+        ($code,$msg) = DNSDB::_zone2cidr($fqdn);
+        my ($rparent) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >> ?", undef, ($msg));
+        $recsth->execute(0, $rparent, $rdata, 16, "$msg", 0, 0, 0, $ttl);
+      } else {
+        my $domid = DNSDB::_hostparent($dbh, $fqdn);
+        if ($domid) {
+          $recsth->execute($domid, 0, $fqdn, 16, $rdata, 0, 0, 0, $ttl);
+        } else {
+          push @deferred, $rec unless $nodefer;
+        }
       }
 
@@ -383 +395 @@
 
       my (undef, $fqdn, $type, $rdata, $ttl, $stamp, $loc) = split /:/, $rec, 7;
+      $fqdn =~ s/\.$//;
+      $fqdn =~ s/^\\052/*/;
       $ttl = 0 if !$ttl;
       $stamp = '' if !$stamp;
@@ -430 +444 @@
         my $val = NetAddr::IP->new(join(':', @v6));
 
-        my ($rdns) = $dbh->selectrow_array("SELECT rdns_id FROM revzones WHERE revnet >> ?", undef, ("$val"));
-        if ($rdns) {
-          $recsth->execute(0, $rdns, $fqdn, 28, $val->addr, 0, 0, 0, $ttl);
+        my $fparent = DNSDB::_hostparent($dbh, $fqdn);
+        if ($fparent) {
+          $recsth->execute($fparent, 0, $fqdn, 28, $val->addr, 0, 0, 0, $ttl);
         } else {
           push @deferred, $rec unless $nodefer;