diff --git a/www/dbdefs.php3.in b/www/dbdefs.php3.in index 94d52092bc1dccf50546c79afaa7ff39fbf226b6..9ca17acb61e9f1163f7a5ac234867072c34d26a2 100644 --- a/www/dbdefs.php3.in +++ b/www/dbdefs.php3.in @@ -1506,7 +1506,7 @@ function TBIPtoNodeID($ip) { DBQueryFatal("select n.node_id from interfaces as i ". "left join nodes as n on n.node_id=i.node_id ". "left join node_types as t ". - " on t.type=n.type and i.card=t.control_net ". + " on t.type=n.type and i.iface=t.control_iface ". "where i.IP='$ip'"); if (mysql_num_rows($query_result) == 0) { diff --git a/www/newnode-defs.php3 b/www/newnode-defs.php3 index abf52b8d3057120b3a765926812627ef94baa01a..75eea2007b15d0bcb2c237774207ccf7f3678263 100644 --- a/www/newnode-defs.php3 +++ b/www/newnode-defs.php3 @@ -125,7 +125,7 @@ function guess_IP ($prefix, $number) { $query_result = DBQueryFatal("select IP from interfaces as i " . "left join nodes as n on i.node_id = n.node_id left join " . "node_types as nt on n.type = nt.type " . - "where n.node_id='$prefix$i' and i.card = nt.control_net"); + "where n.node_id='$prefix$i' and i.iface = nt.control_iface"); if (mysql_num_rows($query_result)) { $row = mysql_fetch_array($query_result); $IP = $row[IP]; diff --git a/www/showstuff.php3 b/www/showstuff.php3 index 67dca97364b055cb1def06951707914b2889d6ee..68bdbfe65144c8bfdf3fa8d7f0ec4f3bfa09848f 100644 --- a/www/showstuff.php3 +++ b/www/showstuff.php3 @@ -1516,7 +1516,7 @@ function SHOWNODE($node_id) { "left join reserved as r on n.node_id=r.node_id ". "left join node_activity as na on n.node_id=na.node_id ". "left join node_types as t on t.type=n.type ". - "left join interfaces as i on i.card=t.control_net ". + "left join interfaces as i on i.iface=t.control_iface ". " and i.node_id=n.node_id ". "left join interfaces as pi on pi.card=t.control_net ". " and pi.node_id=n.phys_nodeid ".