Changeset 543 for trunk/cgi-bin/admin.cgi

Timestamp:

11/02/12 16:17:29 (12 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix minor IPv4-ism in admin allocate. See #22.

File:

• trunk/cgi-bin/admin.cgi (modified) (2 diffs)

trunk/cgi-bin/admin.cgi

@@ -115 +115 @@
 elsif ($webvar{action} eq 'alloc') {
 
-  if ($webvar{cidr} !~ /^\s*(\d{1,3}\.){3}\d{1,3}(\/\d{2})?\s*$/) {
+  my $cidr = new NetAddr::IP $webvar{cidr};
+  if (!$cidr || "$cidr" =~ /^0/) {
     $page->param(errmsg => "Can't allocate something that's not a netblock/ip");
     goto ERRJUMP;
@@ -145 +146 @@
   }
 
-  my $cidr = new NetAddr::IP $webvar{cidr};
   my @data;
   if ($webvar{alloctype} eq 'rm') {