Changeset 607

Timestamp:

04/03/14 17:51:40 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix very subtle bug in converting IP values to .arpa "hostnames" for
reverse zone display; NetAddr::IP converts:

knurd.5.0.0.0.b.0.0.b.5.b.0.b.f.e.e.b.d.a.e.d.ip6.arpa

to 192.168.7.6/32. O_o Really.

Since .arpa "hostnames" in reverse zones don't need to be converted to
.arpa "hostnames", we'll just skip them all.

File:

• trunk/DNSDB.pm (modified) (1 diff)

trunk/DNSDB.pm

@@ -3747 +3747 @@
   while (my $rec = $recsth->fetchrow_hashref) {
     if ($args{revrec} eq 'y' && $args{defrec} eq 'n' &&
-        ($self->{showrev_arpa} eq 'record' || $self->{showrev_arpa} eq 'all') ) {
+        ($self->{showrev_arpa} eq 'record' || $self->{showrev_arpa} eq 'all') &&
+        $rec->{val} !~ /\.arpa$/ ) {
+      # note we're sneakily skipping all reverse zone .arpa "hostnames" on the excuse
+      # that this fragment won't do anything anyway.  however:
+      # knurd.5.0.0.0.b.0.0.b.5.b.0.b.f.e.e.b.d.a.e.d.ip6.arpa -> 192.168.7.6/32
+      # when fed to NetAddr::IP.  O_o  (At least 4.058, .062, and .071, on CentOS 5 and Debian wheezy and sid)
 ##enhance:  extend {showrev_arpa} eq 'record' to specify record types
-      my $tmp = new NetAddr::IP $rec->{val};
-      $rec->{val} = DNSDB::_ZONE($tmp, 'ZONE', 'r', '.').($tmp->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
+      my $tmpip = new NetAddr::IP $rec->{val};
+      $rec->{val} = DNSDB::_ZONE($tmpip, 'ZONE', 'r', '.').($tmpip->{isv6} ? '.ip6.arpa' : '.in-addr.arpa') if $tmpip;
     }
     push @working, $rec;