Changeset 571 for trunk

Timestamp:

12/30/13 17:35:19 (11 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix buglet in AXFR import of non-octet IPv4 reverse zones; a certain
form of nont-octet delegation in-addr.arpa name would not be detected
causing the import to fail.

File:

• trunk/DNSDB.pm (modified) (2 diffs)

trunk/DNSDB.pm

@@ -1136 +1136 @@
     my $tmpzone = $zone;
     $tmpzone =~ s/\.in-addr\.arpa\.?//;
-    return ('FAIL', "Non-numerics in apparent IPv4 reverse zone name") if $tmpzone !~ /^(?:\d+-)?[\d\.]+$/;
+    return ('FAIL', "Non-numerics in apparent IPv4 reverse zone name [$tmpzone]") if $tmpzone !~ m{^(?:\d+[/-])?[\d\.]+$};
 
     # Snag the octet pieces
@@ -1153 +1153 @@
     # Alternate form:  The second number is actually the real netmask, not the end of the range.
     my $masklen = 0;
-    if ($octs[0] =~ /^((\d+)-(\d+))$/) {        # take the range...
+    if ($octs[0] =~ m{^((\d+)[/-](\d+))$}) {    # take the range...
       if (24 < $3 && $3 < 31) {
         # we have a real netmask