Changeset 262 for branches/dns/cgi-bin/IPDB.pm

Timestamp:

06/17/05 16:42:45 (19 years ago)

Author:

Kris Deugau

Message:

/branches/dns

Update branch base with trunk changes from r216:261

File:

• branches/dns/cgi-bin/IPDB.pm (modified) (7 diffs)

branches/dns/cgi-bin/IPDB.pm

@@ -23 +23 @@
 @EXPORT_OK    = qw(
         %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist @masterblocks
-        %allocated %free %routed %bigfree
+        %allocated %free %routed %bigfree %IPDBacl
         &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock &deleteBlock
         &mailNotify
@@ -31 +31 @@
 %EXPORT_TAGS    = ( ALL => [qw(
                 %disp_alloctypes %list_alloctypes %def_custids @citylist @poplist
-                @masterblocks %allocated %free %routed %bigfree
+                @masterblocks %allocated %free %routed %bigfree %IPDBacl
                 &initIPDBGlobals &connectDB &finish &checkDBSanity &allocateBlock
                 &deleteBlock &mailNotify
@@ -50 +50 @@
 our %routed;
 our %bigfree;
+our %IPDBacl;
 
 # Let's initialize the globals.
@@ -83 +84 @@
   $sth = $dbh->prepare("select cidr from masterblocks order by cidr");
   $sth->execute;
+  return (undef,$sth->errstr) if $sth->err;
   for (my $i=0; my @data = $sth->fetchrow_array(); $i++) {
     $masterblocks[$i] = new NetAddr::IP $data[0];
@@ -91 +93 @@
     $routed{"$masterblocks[$i]"} = 0;
   }
+
+  # Load ACL data.  Specific username checks are done at a different level.
+  $sth = $dbh->prepare("select username,acl from users");
+  $sth->execute;
   return (undef,$sth->errstr) if $sth->err;
+  while (my @data = $sth->fetchrow_array) {
+    $IPDBacl{$data[0]} = $data[1];
+  }
 
   return (1,"OK");
@@ -375 +384 @@
       }; # end eval
       if ($@) {
+        $msg .= ": ".$@;
         eval { $dbh->rollback; };
         return ('FAIL',$msg);
@@ -416 +426 @@
     my @poolip_list = $pool->hostenum;
     if ($class eq 'all') { # (DSL-ish block - *all* IPs available
-      $sth->execute($pool->addr);
+      if ($pool->addr !~ /\.0$/) {      # .0 causes weirdness.
+        $sth->execute($pool->addr);
+      }
       for (my $i=0; $i<=$#poolip_list; $i++) {
         $sth->execute($poolip_list[$i]->addr);
       }
       $pool--;
-      $sth->execute($pool->addr);
+      if ($pool->addr !~ /\.255$/) {    # .255 can cause weirdness.
+        $sth->execute($pool->addr);
+      }
     } else { # (real netblock)
       for (my $i=1; $i<=$#poolip_list; $i++) {