Changeset 875 for trunk

Timestamp:

05/13/16 13:36:59 (8 years ago)

Author:

Kris Deugau

Message:

/trunk

Fix subtle bug in _toPool() that caused generated pool IPs to be inserted
without the correct master ID, which broke a surprising number of things.

File:

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

trunk/cgi-bin/IPDB.pm

@@ -267 +267 @@
   my $inssth = $dbh->prepare(q{
       INSERT INTO poolips (
-          ip,type,parent_id,available,
+          ip,type,parent_id,master_id,available,
           city,description,notes,circuitid,createstamp,modifystamp,privdata,custid,vrf,vlan,rdns
           )
-      VALUES (?,?,?,'n',?,?,?,?,?,?,?,?,?,?,?)
+      VALUES (?,?,?,?,'n',?,?,?,?,?,?,?,?,?,?,?)
     });
   my $updsth = $dbh->prepare("UPDATE poolips SET parent_id = ?, type = ? WHERE parent_id = ?");
@@ -296 +296 @@
           next if $newip->addr eq $gw->addr;
         }
-        $inssth->execute($newip, $newtype, $poolparent, @oldalloc) if !$poolcounter{"$newip"};
+        $inssth->execute($newip, $newtype, $poolparent, $master, @oldalloc) if !$poolcounter{"$newip"};
         $poolcounter{"$newip"}++;
       }