Changeset 772

Timestamp:

02/28/19 18:06:50 (5 years ago)

Author:

Kris Deugau

Message:

/trunk

Whitespace fiddling in aid of certain code editors that can't sanely fold:

if {
} else {
}

Also likely to help somewhat in future migration of per-rectype objectification

File:

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

trunk/DNSDB.pm

@@ -6502 +6502 @@
     print $datafile "Z$zone:$primary:$email"."::$refresh:$retry:$expire:$min_ttl:$ttl:$stamp:$loc\n"
       or die $!;
-
-  } elsif ($typemap{$type} eq 'A') {
-
+  } # SOA
+
+  elsif ($typemap{$type} eq 'A') {
     ($host,$val) = __revswap($host,$val) if $revrec eq 'y';
     print $datafile "+$host:$val:$ttl:$stamp:$loc\n" or die $!;
-
-  } elsif ($typemap{$type} eq 'NS') {
-
+  } # A
+
+  elsif ($typemap{$type} eq 'NS') {
     if ($revrec eq 'y') {
       $val = NetAddr::IP->new($val);
@@ -6535 +6535 @@
       print $datafile "\&$host"."::$val:$ttl:$stamp:$loc\n" or die $!;
     }
-
-  } elsif ($typemap{$type} eq 'AAAA') {
-
+  } # NS
+
+  elsif ($typemap{$type} eq 'AAAA') {
     ($host,$val) = __revswap($host,$val) if $revrec eq 'y';
     my $altgrp = 0;
@@ -6559 +6559 @@
     }
     print $datafile "$prefix:$ttl:$stamp:$loc\n" or die $!;
-
-  } elsif ($typemap{$type} eq 'MX') {
-
+  } # AAAA
+
+  elsif ($typemap{$type} eq 'MX') {
     ($host,$val) = __revswap($host,$val) if $revrec eq 'y';
     print $datafile "\@$host"."::$val:$dist:$ttl:$stamp:$loc\n" or die $!;
-
-  } elsif ($typemap{$type} eq 'TXT') {
-
+  } # MX
+
+  elsif ($typemap{$type} eq 'TXT') {
     ($host,$val) = __revswap($host,$val) if $revrec eq 'y';
 # le sigh.  Some idiot DNS implementations don't seem to like tinydns autosplitting
@@ -6610 +6610 @@
 #:3600
 
-  } elsif ($typemap{$type} eq 'CNAME') {
-
+  } # TXT
+
+  elsif ($typemap{$type} eq 'CNAME') {
     ($host,$val) = __revswap($host,$val) if $revrec eq 'y';
     print $datafile "C$host:$val:$ttl:$stamp:$loc\n" or die $!;
-
-  } elsif ($typemap{$type} eq 'SRV') {
-
+  } # CNAME
+
+  elsif ($typemap{$type} eq 'SRV') {
     ($host,$val) = __revswap($host,$val) if $revrec eq 'y';
 
@@ -6629 +6630 @@
     }
     print $datafile "$prefix\\000:$ttl:$stamp:$loc\n" or die $!;
-
-  } elsif ($typemap{$type} eq 'RP') {
-
+  } # SRV
+
+  elsif ($typemap{$type} eq 'RP') {
     ($host,$val) = __revswap($host,$val) if $revrec eq 'y';
     # RP consists of two mostly free-form strings.
@@ -6646 +6647 @@
     }
     print $datafile "$prefix\\000:$ttl:$stamp:$loc\n" or die $!;
-
-  } elsif ($typemap{$type} eq 'PTR') {
-
+  } # RP
+
+  elsif ($typemap{$type} eq 'PTR') {
     $$recflags{$val}++;
     if ($revrec eq 'y') {
@@ -6677 +6678 @@
       print $datafile "^$host:$val:$ttl:$stamp:$loc\n" or die $!;
     }
-
-  } elsif ($type == 65280) { # A+PTR
-
+  } # PTR
+
+  elsif ($type == 65280) { # A+PTR
     $$recflags{$val}++;
     print $datafile "=$host:$val:$ttl:$stamp:$loc\n" or die $!;
-
-  } elsif ($type == 65281) { # AAAA+PTR
-
+  } # A+PTR
+
+  elsif ($type == 65281) { # AAAA+PTR
     $$recflags{$val}++;
     # treat these as two separate records.  since tinydns doesn't have
@@ -6697 +6698 @@
 ##fixme: add a config flag to indicate use of the patch from http://www.fefe.de/dns/
 # type 6 is for AAAA+PTR, type 3 is for AAAA
-
-  } elsif ($type == 65282) { # PTR template
-
+  } # AAAA+PTR
+
+  elsif ($type == 65282) { # PTR template
     # only useful for v4 with standard DNS software, since this expands all
     # IPs in $zone (or possibly $val?) with autogenerated records
@@ -6712 +6713 @@
       $self->__publish_subnet($val, $recflags, $host, $datafile, $ttl, $stamp, $loc, $zone, 1);
     }
-
-  } elsif ($type == 65283) { # A+PTR template
-
+  } # PTR template
+
+  elsif ($type == 65283) { # A+PTR template
     $val = NetAddr::IP->new($val);
     # Just In Case.  An A+PTR should be impossible to add to a v6 revzone via API.
@@ -6726 +6727 @@
       $self->__publish_subnet($val, $recflags, $host, $datafile, $ttl, $stamp, $loc, $zone, 0);
     }
-
-  } elsif ($type == 65284) { # AAAA+PTR template
+  } # A+PTR template
+
+  elsif ($type == 65284) { # AAAA+PTR template
     # Stub for completeness.  Could be exported to DNS software that supports
     # some degree of internal automagic in generic-record-creation
     # (eg http://search.cpan.org/dist/AllKnowingDNS/ )
-
-  } elsif ($type == 65285) { # Delegation
+  } # AAAA+PTR template
+
+  elsif ($type == 65285) { # Delegation
     # This is intended for reverse zones, but may prove useful in forward zones.
 
@@ -6757 +6760 @@
       }
     }
-
-  } elsif ($type == 65300) { # ALIAS
+  } # Delegation
+
+  elsif ($type == 65300) { # ALIAS
     # Implemented as a unique record in parallel with many other
     # management tools, for clarity VS formal behviour around CNAME
@@ -6788 +6792 @@
       print $datafile "+$host:$subip:$attl:$stamp:$loc\n" or die $!;
     }
+  } # ALIAS
 
 ##
@@ -6793 +6798 @@
 ##
 
-  } elsif ($type == 44) { # SSHFP
-
+  elsif ($type == 44) { # SSHFP
     ($host,$val) = __revswap($host,$val) if $revrec eq 'y';
 
@@ -6806 +6810 @@
     print $datafile "$rec:$ttl:$stamp:$loc\n" or die $!;
 
-  } else {
+  } # SSHFP
+
+  else {
     # raw record.  we don't know what's in here, so we ASS-U-ME the user has
     # put it in correctly, since either the user is messing directly with the
@@ -6817 +6823 @@
     #print $datafile ":$host:$type:$val:$ttl:$stamp:$loc\n";
 
-  } # record type if-else
+  } # "other"
 
 } # end _printrec_tiny()