Changeset 150 for branches/sql-cleanup/cgi-bin

Timestamp:

02/03/05 14:25:01 (20 years ago)

Author:

Kris Deugau

Message:

/branches/sql-cleanup

Oops, missed some code updates required for change in pool alloctypes.

File:

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

branches/sql-cleanup/cgi-bin/IPDB.pm

@@ -340 +340 @@
 
           # And initialize the pool, if necessary
+          # PPPoE pools (currently dialup, DSL, and WiFi) get all IPs made available
+          # "DHCP" or "real-subnet" pools have the net, gw, and bcast IPs removed.
           if ($type =~ /^.p$/) {
             $msg = "Could not initialize IPs in new $disp_alloctypes{$type} $cidr";
-            initPool($dbh,$cidr,$type,$city,($type eq 'dp' ? "all" : "normal"));
+            my ($code,$rmsg) = initPool($dbh,$cidr,$type,$city,"all");
+            die $rmsg if $code eq 'FAIL';
+          } elsif ($type =~ /^.d$/) {
+            $msg = "Could not initialize IPs in new $disp_alloctypes{$type} $cidr";
+            my ($code,$rmsg) = initPool($dbh,$cidr,$type,$city,"normal");
+            die $rmsg if $code eq 'FAIL';
           }