Changeset 859 for trunk/DNSDB

Timestamp:

09/15/22 18:02:12 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

BIND export, unwinding dev saves, 11 of many many

• Move $arpazone declaration up so other bits below the view file-opener block can use it
• Write a docucomment header to the zone file once opened
• Fix calling convention for passing zone file handles down to printrec_bind()
• Make sure SOA primary NS and responsible contact values are dot-terminated
• On SOA print-to-zonefile error, return an error message that actually means something

File:

• trunk/DNSDB/ExportBIND.pm (modified) (5 diffs)

trunk/DNSDB/ExportBIND.pm

@@ -65 +65 @@
     eval {
 
+      my $arpazone = DNSDB::_ZONE($cidr, 'ZONE', 'r', '.').($cidr->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
+
       # write fresh records if:
       #  - we are not using the cache
@@ -82 +84 @@
         push @loclist, $defloc unless grep /$defloc/, @loclist;
         my $zonepath = $dnsdb->{bind_export_reverse_zone_path};
-        my %zonefiles;  # to be a list of file handles.
+        my %zonefiles;  # to be a hash of file handles.
 ##fixme:  need to open separate zone files for aggregated metazones eg /22 or /14
         foreach my $loc (@loclist) {
@@ -88 +90 @@
           $zfilepath =~ s/\%view/$loc/;
           $zfilepath =~ s/\%zone/$revzone/;
-          my $arpazone = DNSDB::_ZONE($cidr, 'ZONE', 'r', '.').($cidr->{isv6} ? '.ip6.arpa' : '.in-addr.arpa');
           $zfilepath =~ s/\%arpazone/$arpazone/;
           # Just In Case(TM)
           $zfilepath =~ s,[^\w./-],_,g;
-          #open $zonefiles{$loc}, ">", $zfilepath;
+          open $zonefiles{$loc}, ">", $zfilepath;
+          print {$zonefiles{$loc}} "; $arpazone in view $loc\n";
 print "open zonefile for '$loc', '$zfilepath'\n";
         }
@@ -99 +101 @@
         $soasth->execute($revid);
         my (@zsoa) = $soasth->fetchrow_array();
-        printrec_bind($zonefilehandle, $zsoa[7], 'y', \@loclist, $revzone,
+        printrec_bind(\%zonefiles, $zsoa[7], 'y', \@loclist, $revzone,
           $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
 
@@ -239 +241 @@
 ##fixme?:  alternate SOA serial schemes?
     $serial = strftime("%Y%m%d%H", localtime()) if !$serial;
+    $primary .= "." if $primary !~ /\.$/;
+    $email .= "." if $email !~ /\.$/;
 #    print *{$zonefiles->{$loc}} "Z$zone:$primary:$email:$serial:$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n"
 #      or die $!;
     print *{$zonefiles->{$loc}} "$zone  $ttl    IN      SOA     $primary        $email  ( $serial $refresh $retry $expire $min_ttl )\n"
-       or die $!;
+       or die "couldn't write $zone SOA: $!";
   } # SOA