Changeset 550 for branches/stable/cgi-bin/IPDB.pm

Timestamp:

11/12/12 17:31:34 (12 years ago)

Author:

Kris Deugau

Message:

/branches/stable

Commit semihack allocate-from-browsed-freeblock changes to stable branch

File:

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

branches/stable/cgi-bin/IPDB.pm

@@ -345 +345 @@
 #       and available='y' order by ip limit 1);
 
-      $sth = $dbh->prepare("select ip from poolips where pool='$alloc_from'".
-        " and available='y' order by ip");
-      $sth->execute;
-
-      my @data = $sth->fetchrow_array;
-      $cidr = $data[0];  # $cidr is already declared when we get here!
+# If no specific IP was requested, pick the next available one from the pool.
+      if (!$cidr) {
+        $sth = $dbh->prepare("select ip from poolips where pool='$alloc_from'".
+          " and available='y' order by ip");
+        $sth->execute;
+
+        my @data = $sth->fetchrow_array;
+        $cidr = $data[0];  # $cidr is already declared when we get here!
+      }
 
       $sth = $dbh->prepare("update poolips set custid='$custid',".