From 5df98a5000a86b7f6dfce4a54cc4a33e01d9577b Mon Sep 17 00:00:00 2001 From: Clint Armstrong Date: Wed, 22 Jul 2015 09:20:49 -0400 Subject: [PATCH 1/3] add dell networking n switches as powerconnect --- includes/discovery/os/powerconnect.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/includes/discovery/os/powerconnect.inc.php b/includes/discovery/os/powerconnect.inc.php index a661245c5..8072e78de 100644 --- a/includes/discovery/os/powerconnect.inc.php +++ b/includes/discovery/os/powerconnect.inc.php @@ -5,6 +5,9 @@ if (!$os) { if (stristr($sysDescr, 'PowerConnect ')) { $os = 'powerconnect'; } + else if (stristr($sysDescr, 'Dell Networking N')) { + $os = 'powerconnect'; + } else if (preg_match('/Dell.*Gigabit\ Ethernet/i', $sysDescr)) { $os = 'powerconnect'; } //end if From 9ec836b9768bdea9de200917ef12b0a4171ab402 Mon Sep 17 00:00:00 2001 From: Clint Armstrong Date: Wed, 22 Jul 2015 10:08:49 -0400 Subject: [PATCH 2/3] Revert "add dell networking n switches as powerconnect" This reverts commit 5df98a5000a86b7f6dfce4a54cc4a33e01d9577b. --- includes/discovery/os/powerconnect.inc.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/includes/discovery/os/powerconnect.inc.php b/includes/discovery/os/powerconnect.inc.php index 8072e78de..a661245c5 100644 --- a/includes/discovery/os/powerconnect.inc.php +++ b/includes/discovery/os/powerconnect.inc.php @@ -5,9 +5,6 @@ if (!$os) { if (stristr($sysDescr, 'PowerConnect ')) { $os = 'powerconnect'; } - else if (stristr($sysDescr, 'Dell Networking N')) { - $os = 'powerconnect'; - } else if (preg_match('/Dell.*Gigabit\ Ethernet/i', $sysDescr)) { $os = 'powerconnect'; } //end if From 585e601e9ce5918e818717f7609892d97dd3bcc7 Mon Sep 17 00:00:00 2001 From: Clint Armstrong Date: Wed, 22 Jul 2015 10:14:42 -0400 Subject: [PATCH 3/3] detect as dnos --- includes/discovery/os/dnos.inc.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/includes/discovery/os/dnos.inc.php b/includes/discovery/os/dnos.inc.php index 5af6a536a..b83c92a91 100644 --- a/includes/discovery/os/dnos.inc.php +++ b/includes/discovery/os/dnos.inc.php @@ -4,4 +4,7 @@ if (!$os) { if (strstr($sysObjectId, '.1.3.6.1.4.1.6027.1.')) { $os = 'dnos'; } + if (strstr($sysObjectId, '.1.3.6.1.4.1.674.10895.3042')) { + $os = 'dnos'; + } }