Changeset 749 for trunk/cgi-bin

Timestamp:

06/17/15 17:34:19 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Commit last branch of rDNS call for mergeBlocks(); target == "leaf"
allocation.
See #8.

File:

• trunk/cgi-bin/IPDB.pm (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -2560 +2560 @@
     } # scope eq 'clearpeer' || 'clearall'
 
+  } elsif ($args{newtype} =~ /.[enr]/) {
+    # Merge to leaf type
+
+    # Resize rDNS template for $prime
+    _rpc('resizeTemplate', oldcidr => "$binfo->{block}", newcidr => $newblock->network.'', rpcuser => $args{user});
+
+    # Assemble a list of blocks to delete...
+    my $cidrlist;
+    foreach my $mblock (@retlist) {
+      $cidrlist .= $mblock->{block}."," unless $mblock->{block} =~ $newblock;
+    }
+    # Delete all other records within the new block
+    $cidrlist .= $binfo->{block};
+    _rpc('delRevSet', cidrlist => $cidrlist, rpcuser => $args{user}, delforward => 'y', delsubs => 'y',
+        parpatt => $pinfo->{rdns});
+
   } # type grouping for rDNS calls