From ac0221f7e509ba64f9ee96d122a499d673c32001 Mon Sep 17 00:00:00 2001
From: laf <neil@lathwood.co.uk>
Date: Wed, 20 May 2015 13:41:23 +0100
Subject: [PATCH] Update SQL query for ospf_nbrs lookup to use device_id

---
 includes/discovery/discovery-protocols.inc.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/includes/discovery/discovery-protocols.inc.php b/includes/discovery/discovery-protocols.inc.php
index e06a8c745..114c1dcd8 100644
--- a/includes/discovery/discovery-protocols.inc.php
+++ b/includes/discovery/discovery-protocols.inc.php
@@ -148,9 +148,8 @@ echo("OSPF Discovery: ");
 
 if ($config['autodiscovery']['ospf'] === TRUE) {
     echo "enabled\n";
-    foreach (dbFetchRows("SELECT DISTINCT(`ospfNbrIpAddr`),`device_id` FROM `ospf_nbrs`") as $nbr) {
+    foreach (dbFetchRows("SELECT DISTINCT(`ospfNbrIpAddr`),`device_id` FROM `ospf_nbrs` WHERE `device_id`=?", array($device['device_id'])) as $nbr) {
         $ip = $nbr['ospfNbrIpAddr'];
-        $device_id = $nbr['device_id'];
         if (match_network($config['autodiscovery']['nets-exclude'], $ip)) {
             echo("x");
             continue;
@@ -164,7 +163,7 @@ if ($config['autodiscovery']['ospf'] === TRUE) {
         if (isset($remote_device_id) && $remote_device_id > 0) {
             log_event("Device $name ($ip) autodiscovered through OSPF", $remote_device_id, 'system');
         } else {
-            log_event("OSPF discovery of $name ($ip) failed - check ping and SNMP access", $device_id, 'system');
+            log_event("OSPF discovery of $name ($ip) failed - check ping and SNMP access", $device['device_id'], 'system');
         }
     }
 } else {