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] 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 a661245c5..7f78d8868 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)) {