Changeset 350 for trunk

Timestamp:

06/26/12 13:48:00 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Tweak addRec() and updateRec() to allow "bad" hostnames so TXT records
can be used in reverse zones
Expand export of TXT records to properly export them in reverse zones

Thanks to Steve Atkins for pointing this out on the pgsql-general mailing list.

See #26.

File:

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

trunk/DNSDB.pm

@@ -3141 +3141 @@
   # of types.  Other things may also be added to validate default records of several flavours.
   return ('FAIL', "Hostnames may not contain anything other than (0-9 a-z . _)")
-        if $defrec eq 'n' && $$host !~ /^[0-9a-z_%.-]+$/i;
+        if $defrec eq 'n' && ($revrec eq 'y' ? $$rectype != $reverse_typemap{TXT} : 1) &&
+                $$host !~ /^[0-9a-z_%.-]+$/i;
 
   # Collect these even if we're only doing a simple A record so we can call *any* validation sub
@@ -3256 +3257 @@
   # of types.  Other things may also be added to validate default records of several flavours.
   return ('FAIL', "Hostnames may not contain anything other than (0-9 a-z - . _)")
-        if $defrec eq 'n' && $$host !~ /^[0-9a-z_%.-]+$/i;
+        if $defrec eq 'n' && ($revrec eq 'y' ? $$rectype != $reverse_typemap{TXT} : 1) &&
+                $$host !~ /^[0-9a-z_%.-]+$/i;
 
   # only MX and SRV will use these
@@ -4408 +4410 @@
 
 ##fixme:  split v-e-r-y long TXT strings?  will need to do so for BIND export, at least
-        $val =~ s/:/\\072/g;    # may need to replace other symbols
-        print $datafile "'$host:$val:$ttl:$stamp:$loc\n";
+        if ($revrec eq 'n') {
+          $val =~ s/:/\\072/g;  # may need to replace other symbols
+          print $datafile "'$host:$val:$ttl:$stamp:$loc\n";
+        } else {
+          $host =~ s/:/\\072/g; # may need to replace other symbols
+          my $val2 = NetAddr::IP->new($val);
+          print $datafile "'"._ZONE($val2, 'ZONE', 'r', '.').($val2->{isv6} ? '.ip6.arpa' : '.in-addr.arpa').
+                ":$host:$ttl:$stamp:$loc\n";
+        }
 
 # by-hand TXT