From be579b3cf9e0d2165b1410cbd85e6f6bdd16b458 Mon Sep 17 00:00:00 2001
From: Mark Nagel <github@ciscoqid.com>
Date: Fri, 23 Oct 2015 09:18:05 -0700
Subject: [PATCH] Use official NET-SNMP-EXTEND-MIB first for running distro
 command, then fallback to the older OID subtree.

---
 includes/polling/os/unix.inc.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/includes/polling/os/unix.inc.php b/includes/polling/os/unix.inc.php
index 96403771f..053eae98e 100644
--- a/includes/polling/os/unix.inc.php
+++ b/includes/polling/os/unix.inc.php
@@ -32,9 +32,16 @@ if ($device['os'] == "linux" || $device['os'] == "endian") {
     }
 
     # Distro "extend" support
-    $features = snmp_get($device, ".1.3.6.1.4.1.2021.7890.1.3.1.1.6.100.105.115.116.114.111", "-Oqv", "UCD-SNMP-MIB");
+
+    # NET-SNMP-EXTEND-MIB::nsExtendOutput1Line.\"distro\"
+    $features = snmp_get($device, ".1.3.6.1.4.1.8072.1.3.2.3.1.1.6.100.105.115.116.114.111", "-Oqv", "NET-SNMP-EXTEND-MIB");
     $features = str_replace("\"", "", $features);
 
+    if (!$features) { # No "extend" support, try legacy UCD-MIB shell support
+        $features = snmp_get($device, ".1.3.6.1.4.1.2021.7890.1.3.1.1.6.100.105.115.116.114.111", "-Oqv", "UCD-SNMP-MIB");
+        $features = str_replace("\"", "", $features);
+    }
+
     if (!$features) { # No "extend" support, try "exec" support
         $features = snmp_get($device, ".1.3.6.1.4.1.2021.7890.1.101.1", "-Oqv", "UCD-SNMP-MIB");
         $features = str_replace("\"", "", $features);