Changeset 893 for trunk

Timestamp:

06/25/25 18:45:14 (4 weeks ago)

Author:

Kris Deugau

Message:

/trunk

Copy sub in from tiny-import.pl to convert octal escapes to normal
characters, so ExportBIND.pm can use it on stray TXT records. Exported
as-is these work fine in tinyDNS, but get weirdly unescaped when fed to
BIND et al (assuming they don't just reject the zone outright).

Should arguably remove the copy in tiny-import.pl and reference it from
DNSDB.pm

Location:

trunk

Files:

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

trunk/DNSDB.pm

@@ -2159 +2159 @@
   return 1;
 } # _check_hostname_form()
+
+# Reverse a lurking tinydns-centric octal substitution
+sub _deoctal {
+  my $targ = shift;
+  while ($$targ =~ /\\(\d{3})/) {
+    my $sub = chr(oct($1));
+    $$targ =~ s/\\$1/$sub/g;
+  }
+} # _deoctal()
 
 

trunk/DNSDB/ExportBIND.pm

@@ -579 +579 @@
 #    ($host,$val) = __revswap($host,$val) if $revrec eq 'y';
 #    print {$zonefiles->{$loc}} "$host  $ttl    IN      TXT     \"$val\"\n" or die $!;
+    # Clean up some lingering tinydns/VegaDNSisms
+    DNSDB::_deoctal(\$val);
     my $recdata = "$host.       $ttl    IN      TXT     \"$val\"\n";
     __recprint($zonefiles, $loclist, $loc, $recdata);