From e8c64e98a409e7379cbddd2e59a623dd7c81922c Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Thu, 21 Jan 2016 08:50:20 +1000
Subject: [PATCH 1/3] Fix use of CISCO-AAA-SESSION-MIB

It should only be used if OS was discovered.
---
 includes/discovery/os/ios.inc.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/includes/discovery/os/ios.inc.php b/includes/discovery/os/ios.inc.php
index 731d68bf0..04d399d48 100644
--- a/includes/discovery/os/ios.inc.php
+++ b/includes/discovery/os/ios.inc.php
@@ -22,10 +22,12 @@ if (empty($os)) {
         $os = 'iosxr';
     }
 
-    $extra_mibs = array(
-        "ciscoAAASessionMIB" => "CISCO-AAA-SESSION-MIB",
-    );
-    register_mibs($device, $extra_mibs, "includes/discovery/os/ios.inc.php");
+    if (!empty($os)) {
+        $extra_mibs = array(
+            "ciscoAAASessionMIB" => "CISCO-AAA-SESSION-MIB",
+        );
+        register_mibs($device, $extra_mibs, "includes/discovery/os/ios.inc.php");
+    }
 }
 
 // Fallback case

From 53b5f4e1c8c3c4fe643c8f56a2bd7f78d3d5fd9b Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Thu, 21 Jan 2016 08:52:32 +1000
Subject: [PATCH 2/3] Fix the same bug in routeros section

---
 includes/discovery/os/routeros.inc.php | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/includes/discovery/os/routeros.inc.php b/includes/discovery/os/routeros.inc.php
index a5e407cd5..4d035a214 100644
--- a/includes/discovery/os/routeros.inc.php
+++ b/includes/discovery/os/routeros.inc.php
@@ -20,8 +20,10 @@ if (!$os) {
     }
 
     // poll Cisco AAA MIB
-    $extra_mibs = array(
-        "ciscoAAASessionMIB" => "CISCO-AAA-SESSION-MIB",
-    );
-    register_mibs($device, $extra_mibs, "includes/discovery/os/routeros.inc.php");
+    if (!empty($os)) {
+        $extra_mibs = array(
+            "ciscoAAASessionMIB" => "CISCO-AAA-SESSION-MIB",
+        );
+        register_mibs($device, $extra_mibs, "includes/discovery/os/routeros.inc.php");
+    }
 }

From 302a7d5c7373730a3fc5129747741070e3f9d174 Mon Sep 17 00:00:00 2001
From: Paul Gear <github@libertysys.com.au>
Date: Thu, 21 Jan 2016 08:54:00 +1000
Subject: [PATCH 3/3] Tidy mess left by CISCO-AAA-SESSION-MIB bug

---
 sql-schema/093.sql | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 sql-schema/093.sql

diff --git a/sql-schema/093.sql b/sql-schema/093.sql
new file mode 100644
index 000000000..6caaecf4e
--- /dev/null
+++ b/sql-schema/093.sql
@@ -0,0 +1 @@
+DELETE FROM `device_mibs` WHERE `module` = 'CISCO-AAA-SESSION-MIB' AND `mib` = 'ciscoAAASessionMIB';