Changeset 699

Timestamp:

02/20/15 18:15:14 (9 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix snafu in initPool(); forgot to set master_id

File:

• trunk/cgi-bin/IPDB.pm (modified) (4 diffs)

trunk/cgi-bin/IPDB.pm

@@ -1237 +1237 @@
   # Retrieve some odds and ends for defaults on the IPs
   my ($pcustid) = $dbh->selectrow_array("SELECT def_custid FROM alloctypes WHERE type=?", undef, ($type) );
-  my ($vrf,$vlan) = $dbh->selectrow_array("SELECT vrf,vlan FROM allocations WHERE id = ?",
+  my ($vrf,$vlan,$master) = $dbh->selectrow_array("SELECT vrf,vlan,master_id FROM allocations WHERE id = ?",
         undef, ($parent) );
 
@@ -1252 +1252 @@
   eval {
     # have to insert all pool IPs into poolips table as "unallocated".
-    $sth = $dbh->prepare("INSERT INTO poolips (ip,custid,city,type,parent_id) VALUES (?,?,?,?,?)");
+    $sth = $dbh->prepare("INSERT INTO poolips (ip,custid,city,type,parent_id,master_id) VALUES (?,?,?,?,?,?)");
 
     # in case of pool extension by some means, we need to see what IPs were already inserted
@@ -1288 +1288 @@
       my $baseip = $poolip_list[$i]->addr;
       if ($baseip !~ /\.(?:0|255)$/ && !$foundips{$poolip_list[$i]}) {
-        $sth->execute($baseip, $pcustid, $city, $type, $parent);
+        $sth->execute($baseip, $pcustid, $city, $type, $parent, $master);
       }
     }
@@ -1296 +1296 @@
     if ($class eq 'all') { # (DSL-ish block - *all* IPs available
       if ($pool->addr !~ /\.0$/) {      # .0 causes weirdness.
-        $sth->execute($pool->addr, $pcustid, $city, $type, $parent) unless $foundips{$pool->addr};
-      }
-      $sth->execute($poolip_list[0]->addr, $pcustid, $city, $type, $parent) unless $foundips{$poolip_list[0]};
+        $sth->execute($pool->addr, $pcustid, $city, $type, $parent, $master) unless $foundips{$pool->addr};
+      }
+      $sth->execute($poolip_list[0]->addr, $pcustid, $city, $type, $parent, $master) unless $foundips{$poolip_list[0]};
       $pool--;
       if ($pool->addr !~ /\.255$/) {    # .255 can cause weirdness.
-        $sth->execute($pool->addr, $pcustid, $city, $type, $parent) unless $foundips{$pool->addr};
+        $sth->execute($pool->addr, $pcustid, $city, $type, $parent, $master) unless $foundips{$pool->addr};
       }
     }