From b8cc59922e01b9fdf2d81e61c08be01fbe819935 Mon Sep 17 00:00:00 2001
From: Tony Murray <murraytony@gmail.com>
Date: Fri, 9 Sep 2016 09:57:40 -0500
Subject: [PATCH] fix: NIOS discovery (#4389)

* fix: NIOS discovery
Add nios test

* Add actual sysDescr string for nios
---
 includes/discovery/os/linux.inc.php | 4 +++-
 includes/discovery/os/nios.inc.php  | 4 ++--
 tests/OSDiscoveryTest.php           | 5 +++++
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/includes/discovery/os/linux.inc.php b/includes/discovery/os/linux.inc.php
index 7322764cd6..38fbda6e6e 100644
--- a/includes/discovery/os/linux.inc.php
+++ b/includes/discovery/os/linux.inc.php
@@ -5,8 +5,10 @@ if (!$os) {
         '.1.3.6.1.4.1.674.10892.2',
         '.1.3.6.1.4.1.17163.1.1',
         '.1.3.6.1.4.1.17713.21',
-        '.1.3.6.1.4.1.2.3.51.3'
+        '.1.3.6.1.4.1.2.3.51.3',
+        '.1.3.6.1.4.1.7779.1', // nios
     );
+
     if (starts_with($sysDescr, 'Linux') && !in_array($sysObjectId, $skip_oids)) {
         $os = 'linux';
 
diff --git a/includes/discovery/os/nios.inc.php b/includes/discovery/os/nios.inc.php
index db0b0a63e5..68170580c0 100644
--- a/includes/discovery/os/nios.inc.php
+++ b/includes/discovery/os/nios.inc.php
@@ -1,6 +1,6 @@
 <?php
-if (!$os || $os === 'linux') {
-    if (stristr($sysObjectId, ".1.3.6.1.4.1.7779.1")) {
+if (!$os) {
+    if (str_contains($sysObjectId, ".1.3.6.1.4.1.7779.1")) {
         $os = 'nios';
     }
 }
diff --git a/tests/OSDiscoveryTest.php b/tests/OSDiscoveryTest.php
index 06695f83fc..0f6c3554f2 100644
--- a/tests/OSDiscoveryTest.php
+++ b/tests/OSDiscoveryTest.php
@@ -117,6 +117,11 @@ class DiscoveryTest extends \PHPUnit_Framework_TestCase
         $this->checkOS('netbotz', 'Linux', '.1.3.6.1.4.1.5528.100.20.10.2016');
     }
 
+    public function testNios()
+    {
+        $this->checkOS('nios', 'Linux ns01.hepl.ch 3.14.25 #1 SMP Thu Jun 16 18:19:37 EDT 2016 x86_64', '.1.3.6.1.4.1.7779.1');
+    }
+
     public function testPcoweb()
     {
         $mockSnmp = array(