From 661ed673727e18509c43d3011ebd2ad4354683fd Mon Sep 17 00:00:00 2001
From: Falk Stern <fstern@goodgamestudios.com>
Date: Wed, 7 Oct 2015 16:12:48 +0200
Subject: [PATCH 1/3] Make discovery ignore Dell branded Aruba Wifi
 Controllers. Dell PowerConnect W-3200 controllers have the strings ArubaOS
 and PowerConnect in their sysDescr and powerconnect.inc.php will overwrite
 the Aruba OS detection.

---
 includes/discovery/os/powerconnect.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/discovery/os/powerconnect.inc.php b/includes/discovery/os/powerconnect.inc.php
index a661245c5b..7f78d8868b 100644
--- a/includes/discovery/os/powerconnect.inc.php
+++ b/includes/discovery/os/powerconnect.inc.php
@@ -2,7 +2,7 @@
 
 if (!$os) {
     // if (strstr($sysDescr, "Neyland 24T")) { $os = "powerconnect"; } /* Powerconnect 5324 */
-    if (stristr($sysDescr, 'PowerConnect ')) {
+    if (stristr($sysDescr, 'PowerConnect ') && !stristr($sysDescr, 'ArubaOS') {
         $os = 'powerconnect';
     }
     else if (preg_match('/Dell.*Gigabit\ Ethernet/i', $sysDescr)) {

From 75134f76fcb36389257404a96da30eadf675b801 Mon Sep 17 00:00:00 2001
From: Falk Stern <fstern@goodgamestudios.com>
Date: Wed, 7 Oct 2015 16:16:06 +0200
Subject: [PATCH 2/3] I agree to the conditions of the Contributor Agreement
 contained in doc/General/Contributing.md.

---
 AUTHORS.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/AUTHORS.md b/AUTHORS.md
index bb70b233a3..cefed25dea 100644
--- a/AUTHORS.md
+++ b/AUTHORS.md
@@ -60,5 +60,6 @@ Contributors to LibreNMS:
 - Frederik Mogensen <frederik@server-1.dk> (mogensen)
 - Matthew Scully <matt@mattz0r.me.uk> (mattz0r)
 - Xavier Beaudouin <kiwi@oav.net> (xbeaudouin)
+- Falk Stern <falk@fourecks.de> (fstern)
 
 [1]: http://observium.org/ "Observium web site"

From b6c6ecd359923e09faa5e1e6b5e4727525e4ba98 Mon Sep 17 00:00:00 2001
From: Falk Stern <fstern@goodgamestudios.com>
Date: Wed, 7 Oct 2015 16:27:06 +0200
Subject: [PATCH 3/3] Missing a bracket, sorry.

---
 includes/discovery/os/powerconnect.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/includes/discovery/os/powerconnect.inc.php b/includes/discovery/os/powerconnect.inc.php
index 7f78d8868b..f13f00cc7d 100644
--- a/includes/discovery/os/powerconnect.inc.php
+++ b/includes/discovery/os/powerconnect.inc.php
@@ -2,7 +2,7 @@
 
 if (!$os) {
     // if (strstr($sysDescr, "Neyland 24T")) { $os = "powerconnect"; } /* Powerconnect 5324 */
-    if (stristr($sysDescr, 'PowerConnect ') && !stristr($sysDescr, 'ArubaOS') {
+    if (stristr($sysDescr, 'PowerConnect ') && !stristr($sysDescr, 'ArubaOS')) {
         $os = 'powerconnect';
     }
     else if (preg_match('/Dell.*Gigabit\ Ethernet/i', $sysDescr)) {