Changeset 764 for trunk/cgi-bin

Timestamp:

07/30/15 16:59:30 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

• Shuffle a couple of variable declarations up so we can do a necessary rDNS change in the event of "merge with reserved space" in updateBlock()
• Put a fence on a "DELETE ... IN ()" so that it only runs if we actually have something to put in the IN clause

File:

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

trunk/cgi-bin/IPDB.pm

@@ -1762 +1762 @@
   $sql .= join " = ?, ", @fieldlist;
 
+  # create these here so we can use the expanded CIDR in the rDNS update after the eval,
+  # if we're expanding the block into a "reserved" freeblock
+  my $cidr = NetAddr::IP->new($binfo->{block});
+  my $newblock = NetAddr::IP->new($cidr->addr, $cidr->masklen - 1)->network;
+
   eval {
     # check for block merge first...
     if ($args{fbmerge}) {
-      my $cidr = NetAddr::IP->new($binfo->{block});
-      my $newblock = NetAddr::IP->new($cidr->addr, $cidr->masklen - 1)->network;
       # safety net?  make sure mergeable block passed in is really one or both of
       # a) reserved for expansion of the block and
@@ -1842 +1845 @@
     # and the per-IP set, if there is one.
     _rpc('updateRevSet', %{$args{iprev}}, rpcuser => $args{user}) if keys (%{$args{iprev}});
+
+    # and fix up the template's CIDR if required
+    _rpc('resizeTemplate', oldcidr => "$binfo->{block}", newcidr => $newblock->network.'', rpcuser => $args{user}) 
+        if $args{fbmerge};
   }
 
@@ -1997 +2004 @@
     } # for (... @newblocks)
 
-    $dbh->do("DELETE FROM freeblocks WHERE id IN (".join(',', keys %fbdel).")");
+    $dbh->do("DELETE FROM freeblocks WHERE id IN (".join(',', keys %fbdel).")") if %fbdel;
 
     $dbh->commit;