Changeset 354 for branches

Timestamp:

12/27/06 11:13:46 (18 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Fix lurking buglet in deallocation of static IPs.

If the admin interface (or direct DB manipulation) were used to create an
IP pool within another block, deallocation would fail because the SQL
statement came up with 2 results where it would otherwise only have found 1.

File:

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

branches/stable/cgi-bin/IPDB.pm

@@ -492 +492 @@
       $msg = "Unable to deallocate $disp_alloctypes{$type} $cidr";
       $sth = $dbh->prepare("update poolips set custid='6750400',available='y',".
-        "city=(select city from allocations where cidr >>= '$cidr'),".
+        "city=(select city from allocations where cidr >>= '$cidr'".
+        " order by masklen(cidr) desc limit 1),".
         "description='',notes='',circuitid='' where ip='$cidr'");
       $sth->execute;