Changeset 868 for trunk

Timestamp:

09/22/22 17:36:43 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

BIND export, unwinding dev saves, 20 of many many

• Minor whitespace fiddling for coding style consistency
• Rejig retrieval of locations/views for a zone
• Include 'common' metaview in view list
• Pass location list to printrec_bind(), and iterate over the locations found if the record has no set location

File:

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

trunk/DNSDB/ExportBIND.pm

@@ -84 +84 @@
         # fetch a list of views/locations present in the zone.  we need to publish a file for each one.
         # in the event that no locations are present (~~ $viewlist is empty), /%view collapses to nothing in the zone path
-        my (@loclist) = $dnsdb->{dbh}->selectrow_array("SELECT DISTINCT location FROM records WHERE rdns_id = ?", undef, $revid);
+#        my (@loclist) = $dnsdb->{dbh}->selectrow_array("SELECT DISTINCT location FROM records WHERE rdns_id = ?", undef, $revid);
+        my $tmplocs = $dnsdb->{dbh}->selectall_arrayref("SELECT DISTINCT location FROM records WHERE rdns_id = ?", undef, $revid);
+        my @loclist;
+        foreach my $tloc (@{$tmplocs}) {
+          push @loclist, ($tloc->[0] eq '' ? 'common' : $tloc->[0]);
+        }
+
         push @loclist, $defloc unless grep /$defloc/, @loclist;
+        push @loclist, 'common' unless grep /^common$/, @loclist;
         my $zonepath = $dnsdb->{bind_export_reverse_zone_path};
         my %zonefiles;  # to be a hash of file handles.
@@ -97 +104 @@
           $zfilepath =~ s,[^\w./-],_,g;
           open $zonefiles{$loc}, ">", $zfilepath;
-          printf {$zonefiles{$loc}} "; %s in view %s exported %s\n", $arpazone, $loc, scalar(localtime);
-print "open zonefile for '$loc', '$zfilepath'\n";
+          printf {$zonefiles{$loc}} "; %s in view %s exported %s\n", $arpazone, $loc, scalar(localtime)
+            or die "Error writing SOA [$zone, '$loc']: $!\n";;
         }
 
@@ -105 +112 @@
         my (@zsoa) = $soasth->fetchrow_array();
 ##fixme: do we even need @loclist passed in?
-        printrec_bind(\%zonefiles, $zsoa[7], 'y', \%recflags, $revzone,
+        printrec_bind(\%zonefiles, \@loclist, $zsoa[7], 'y', \%recflags, $revzone,
           $zsoa[0],$zsoa[1],$zsoa[2],$zsoa[3],$zsoa[4],$zsoa[5],$zsoa[6],$zsoa[8],'');
 
@@ -139 +146 @@
           }
 
-          printrec_bind($zonefilehandle, $recid, 'y', \%recflags, $revzone,
+          printrec_bind(\%zonefiles, \@loclist, $recid, 'y', \%recflags, $revzone,
             $host, $type, $val, $dist, $weight, $port, $ttl, $loc, $stamp, $expires, $stampactive);
 
@@ -222 +229 @@
 
 #  my ($zonefiles, $recid, $revrec, $loclist, $zone, $host, $type, $val, $distance, $weight, $port, $ttl,
-  my ($zonefiles, $recid, $revrec, $recflags, $zone, $host, $type, $val, $distance, $weight, $port, $ttl,
+  my ($zonefiles, $loclist, $recid, $revrec, $recflags, $zone, $host, $type, $val, $distance, $weight, $port, $ttl,
         $loc, $stamp, $expires, $stampactive) = @_;
+
+# make sure "global" records get into all the right per-view zone files, without having to do this loop in each record-print location
+##fixme:  maybe exclude the template types?  those may be more expensive to export
+## *ponder*  may be more efficient to loop in each record print due to substitution and manipulation from stored data to formal
+## record for .arpa zones for all records
+  if ($loc eq '') {
+    foreach my $subloc (@{$loclist}) {
+      printrec_bind($zonefiles, $loclist, $recid, $revrec, $recflags, $zone, $host, $type, $val, $distance, $weight, $port, $ttl,
+        $subloc, $stamp, $expires, $stampactive);
+    }
+  }
 
   # Just In Case something is lingering in the DB
@@ -317 +335 @@
           print {$zonefiles->{$loc}} "$val.".DNSDB::_ZONE($zone, 'ZONE', 'r', '.').'.in-addr.arpa'.
                 "       $ttl    IN      PTR     $host\n"
-                or die $!;
+            or die $!;
         } else {
           # not going to care about strange results if $val is not an IP value and is resolveable in DNS
@@ -323 +341 @@
           print {$zonefiles->{$loc}} DNSDB::_ZONE($val, 'ZONE', 'r', '.').($val->{isv6} ? '.ip6.arpa' : '.in-addr.arpa').
                 "       $ttl    IN      PTR     $host\n"
-                or die $!;
+            or die $!;
 
         }