From 12cdec80240800a534e64c5f0df227613a823376 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Mon, 26 Sep 2016 10:56:45 -0500
Subject: [PATCH] Do not rely on OS shipped mibs, just our mibs.

---
 includes/discovery/sensors/fanspeeds/netonix.inc.php    | 2 +-
 includes/discovery/sensors/temperatures/netonix.inc.php | 2 +-
 includes/discovery/sensors/voltages/netonix.inc.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/includes/discovery/sensors/fanspeeds/netonix.inc.php b/includes/discovery/sensors/fanspeeds/netonix.inc.php
index 21edff4f8d..56bce3275c 100644
--- a/includes/discovery/sensors/fanspeeds/netonix.inc.php
+++ b/includes/discovery/sensors/fanspeeds/netonix.inc.php
@@ -27,7 +27,7 @@
 if ($device['os'] == 'netonix') {
     echo 'Netonix: ';
     // NETONIX-SWITCH-MIB::fanTable .1.3.6.1.4.1.46242.2
-    $oids = snmpwalk_cache_multi_oid($device, 'fanTable', array(), 'NETONIX-SWITCH-MIB', '+'.$config['mibdir'].'/netonix');
+    $oids = snmpwalk_cache_multi_oid($device, 'fanTable', array(), 'NETONIX-SWITCH-MIB', $config['mibdir'] . ':' . $config['mibdir'].'/netonix');
     if (is_array($oids)) {
         foreach ($oids as $index => $entry) {
             if (is_numeric($entry['fanSpeed']) && is_numeric($index)) {
diff --git a/includes/discovery/sensors/temperatures/netonix.inc.php b/includes/discovery/sensors/temperatures/netonix.inc.php
index ca78443203..25e2a460de 100644
--- a/includes/discovery/sensors/temperatures/netonix.inc.php
+++ b/includes/discovery/sensors/temperatures/netonix.inc.php
@@ -27,7 +27,7 @@
 if ($device['os'] == 'netonix') {
     echo 'Netonix: ';
     // NETONIX-SWITCH-MIB::tempTable .1.3.6.1.4.1.46242.3
-    $oids = snmpwalk_cache_multi_oid($device, 'tempTable', array(), 'NETONIX-SWITCH-MIB', '+'.$config['mibdir'].'/netonix');
+    $oids = snmpwalk_cache_multi_oid($device, 'tempTable', array(), 'NETONIX-SWITCH-MIB', $config['mibdir'] . ':' . $config['mibdir'].'/netonix');
     if (is_array($oids)) {
         foreach ($oids as $index => $entry) {
             if (is_numeric($entry['temp']) && is_numeric($index) && $entry['temp'] > '0') {
diff --git a/includes/discovery/sensors/voltages/netonix.inc.php b/includes/discovery/sensors/voltages/netonix.inc.php
index 76f0d01ce1..46145c62a2 100644
--- a/includes/discovery/sensors/voltages/netonix.inc.php
+++ b/includes/discovery/sensors/voltages/netonix.inc.php
@@ -27,7 +27,7 @@
 if ($device['os'] == 'netonix') {
     echo 'Netonix: ';
     // NETONIX-SWITCH-MIB::voltageTable .1.3.6.1.4.1.46242.4
-    $oids = snmpwalk_cache_multi_oid($device, 'voltageTable', array(), 'NETONIX-SWITCH-MIB', '+'.$config['mibdir'].'/netonix');
+    $oids = snmpwalk_cache_multi_oid($device, 'voltageTable', array(), 'NETONIX-SWITCH-MIB', $config['mibdir'] . ':' . $config['mibdir'].'/netonix');
     if (is_array($oids)) {
         foreach ($oids as $index => $entry) {
             if (is_numeric($entry['voltage']) && is_numeric($index) && $entry['voltage'] > '0') {