Changeset 256 for trunk

Timestamp:

05/31/05 14:24:33 (19 years ago)

Author:

Kris Deugau

Message:

/trunk

Merge bugfixes from /branches/stable r248:252.

Location:

trunk/cgi-bin

Files:

• IPDB.pm (modified) (1 diff)
• admin.cgi (modified) (3 diffs)
• main.cgi (modified) (1 diff)

trunk/cgi-bin/IPDB.pm

@@ -384 +384 @@
       }; # end eval
       if ($@) {
+        $msg .= ": ".$@;
         eval { $dbh->rollback; };
         return ('FAIL',$msg);

trunk/cgi-bin/admin.cgi

@@ -125 +125 @@
     printAndExit("Can't allocate from outside a free block!!\n")
         if !$data[0];
+  } elsif ($webvar{alloctype} =~ /^(.)i$/) {
+    $sth = $ip_dbh->prepare("select cidr from allocations where cidr >>='$cidr' and (type like '_d' or type like '_p')");
+    $sth->execute;
+    @data = $sth->fetchrow_array;
+# User deserves errors if user can't be bothered to find the pool and a free IP first.
+    printAndExit("Can't allocate static IP from outside a pool!!\n")
+        if !$data[0];
   } else {
     $sth = $ip_dbh->prepare("select cidr from freeblocks where cidr >>='$cidr' and not (routed='n')");
@@ -204 +211 @@
       print "Allocation failed!  IPDB::allocateBlock said:\n$msg\n";
       syslog "err", "($authuser) Allocation of '$webvar{cidr}' to '$webvar{custid}' as ".
-        "'$webvar{type}' failed: '$msg'";
+        "'$webvar{alloctype}' failed: '$msg'";
     }
   } # done city check
@@ -326 +333 @@
   print qq(<hr><a href="admin.cgi?action=showACL">Back</a> to ACL listing\n);
 
-} else {
+} elsif ($webvar{action} ne '<NULL>') {
   print "webvar{action} check failed: Don't know how to $webvar{action}";
 }

trunk/cgi-bin/main.cgi

@@ -838 +838 @@
     }
     syslog "notice", "$authuser allocated '$webvar{fullcidr}' to '$webvar{custid}' as ".
-        "'$webvar{alloctype}'";
+        "'$webvar{alloctype}' ($msg)";
   } else {
     syslog "err", "Allocation of '$webvar{fullcidr}' to '$webvar{custid}' as ".