Changeset 867 for trunk

Timestamp:

09/20/22 18:13:37 (2 years ago)

Author:

Kris Deugau

Message:

/trunk

BIND export, unwinding dev saves, 19 of many many

• Tweak fixed arguments for some calls to publish_template_bind() and tweak sub to match
• More intermediate broom-pushing calling _ZONE
• Actually output some records in publish_template_bind()

File:

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

trunk/DNSDB/ExportBIND.pm

@@ -376 +376 @@
     if ($val->masklen < 16) {
       foreach my $sub ($val->split(16)) {
-        __publish_template_bind($sub, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 0);
+        __publish_template_bind($sub, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 'y');
       }
     } else {
-      __publish_template_bind($val, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 0);
+      __publish_template_bind($val, $recflags, $host, $zonefiles->{$loc}, $ttl, $stamp, $loc, $zone, 'y');
     }
   } # A+PTR template
@@ -401 +401 @@
   my $loc = shift;
   my $zone = new NetAddr::IP shift;
-  my $ptrflag = shift || 0;    ##fixme:  default to PTR instead of A record for the BIND variant of this sub?
+  my $revrec = shift || 'y';
+#  my $ptrflag = shift || 0;    ##fixme:  default to PTR instead of A record for the BIND variant of this sub?
 
   # do this conversion once, not (number-of-ips-in-subnet) times
-  my $arpabase = _ZONE($zone, 'ZONE.in-addr.arpa', 'r', '.');
+  my $arpabase = DNSDB::_ZONE($zone, 'ZONE.in-addr.arpa', 'r', '.');
 
   my $iplist = $sub->splitref(32);
@@ -429 +430 @@
     next if !$rec;
 ##fixme:  trim merged record type voodoo.  "if ($ptrflag) {} else {}" ?
-    if ($ptrflag || $zone->masklen > 24) {
+#    if ($ptrflag || $zone->masklen > 24) {
+    if ($revrec eq 'y' || $zone->masklen > 24) {
 #      print $fh "^$lastoct.$arpabase:$rec:$ttl:$stamp:$loc\n" or die $!;
+##fixme: use $ORIGIN instead?  make the FQDN output switchable-optional?
       print $fh "$lastoct.$arpabase    $ttl    IN      PTR     $rec\n" or die $!;
-      if (!$ptrflag) {
+#      if (!$ptrflag) {
+      if ($revrec ne 'y') {
         # print a separate A record.  Arguably we could use an = record here instead.
 #        print $fh "+$rec:$ip:$ttl:$stamp:$loc\n" or die $!;
+        print $fh "$rec $ttl    IN      A       $ip\n" or die $!;
       }
     } else {
       # A record, not merged
 #      print $fh "=$rec:$ip:$ttl:$stamp:$loc\n" or die $!;
-      print $fh "$rec  $ttl    IN      A       $ip\n" or die $!;
+      print $fh "$rec   $ttl    IN      A       $ip\n" or die $!;
     }
   }