Changeset 759 for trunk

Timestamp:

07/28/15 18:00:43 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Roll up a handful of minor tweaks, typofixes, and cosmetic nudges.
Includes marginally less minor local user passthrough for rDNS RPC in shrinkBlock().

File:

• trunk/cgi-bin/IPDB.pm (modified) (5 diffs)

trunk/cgi-bin/IPDB.pm

@@ -1085 +1085 @@
 # List the IPs in an IP pool.
 # Takes a pool/parent ID
-# Returns
 # Returns an arrayref to a list of hashrefs containing the IP, customer ID, availability flag,
 # description, backreference to the pool/parent, and the IP ID in the pool.
@@ -1845 +1844 @@
   }
 
+##fixme:  RPC failures?
   return ('OK','OK');
 } # end updateBlock()
@@ -2008 +2008 @@
 
   # Only try to update rDNS when the original block is flagged as "rDNS available"
-  _rpc('splitTemplate', cidr => $binfo->{block}, newmask => $args{newmask}, rpcuser => $args{user});
+  _rpc('splitTemplate', cidr => $binfo->{block}, newmask => $args{newmask}, rpcuser => $args{user})
       if ($binfo->{revavail} || $binfo->{revpartial});
 
@@ -2026 +2026 @@
   # just take the new CIDR spec;  this way we can shrink eg .16/28 to .20/30 without extra contortions
   my $newblock = new NetAddr::IP shift;
+
+  my $user = shift;
 
   if (!$newblock) {
@@ -2138 +2140 @@
 
   # Only try to update rDNS when the original block is flagged as "rDNS available"
-  _rpc('resizeTemplate', oldcidr => $binfo->{block}, newcidr => $newblock->network, rpcuser => $args{user});
+  _rpc('resizeTemplate', oldcidr => $binfo->{block}, newcidr => $newblock->network, rpcuser => $user)
       if ($binfo->{revavail} || $binfo->{revpartial});