Changeset 683

Timestamp:

06/17/15 15:12:58 (10 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix semantic snafu in RPC handler's delByCIDR(); subsets of the passed
CIDR were being deleted when they shouldn't have been. Also separate
some code segments for reading clarity.

File:

• trunk/dns-rpc.cgi (modified) (3 diffs)

trunk/dns-rpc.cgi

@@ -841 +841 @@
   _commoncheck(\%args, 'y');
 
+  # Caller may pass 'n' in delsubs.  Assume it should be false/undefined
+  # unless the caller explicitly requested 'yes'
+  $args{delsubs} = 0 if $args{delsubs} ne 'y';
+
   # much like addOrUpdateRevRec()
   my $zonelist = $dnsdb->getZonesByCIDR(%args);
@@ -852 +856 @@
     my $zone = new NetAddr::IP $zonelist->[0]->{revnet};
     if ($zone->contains($cidr)) {
-
       if ($args{delsubs}) {
         # Delete ALL EVARYTHING!!one11!! in $args{cidr}
@@ -879 +882 @@
       } else {
         # Selectively delete only exact matches on $args{cidr}
-
         # We need to strip the CIDR mask on IPv4 /32 assignments, or we can't find single-IP records
         my $filt = ($cidr->{isv6} || $cidr->masklen != 32 ? "$cidr" : $cidr->addr);