From f543768c7b78d520d006014b21ae5153004e8948 Mon Sep 17 00:00:00 2001
From: Eric Miller <>
Date: Wed, 13 Jun 2007 02:56:18 +0000
Subject: [PATCH] Fix detection of Cisco PIX and ASA.

---
 Info.pm | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/Info.pm b/Info.pm
index db8205df..fa6d67fd 100644
--- a/Info.pm
+++ b/Info.pm
@@ -294,7 +294,8 @@ Protocol (LLDP) Support.
 
 =item SNMP::Info::MAU
 
-MAU-MIB (RFC2668).  Some Layer2 devices use this for extended Ethernet (Media Access Unit) interface information.
+MAU-MIB (RFC2668).  Some Layer2 devices use this for extended Ethernet
+(Media Access Unit) interface information.
 
 =item SNMP::Info::NortelStack
 
@@ -306,8 +307,9 @@ RAPID-CITY.  Inhertited by Nortel switches for duplex and VLAN information.
 
 =item SNMP::Info::SONMP
 
-SYNOPTICS-ROOT-MIB, S5-ETH-MULTISEG-TOPOLOGY-MIB.  Provides translation from Nortel Topology
-Table information to CDP.  Inherited by Nortel/Bay/Synoptics switches and hubs.
+SYNOPTICS-ROOT-MIB, S5-ETH-MULTISEG-TOPOLOGY-MIB.  Provides translation from
+Nortel Topology Table information to CDP.  Inherited by Nortel/Bay/Synoptics
+switches and hubs.
 
 =back
 
@@ -1016,10 +1018,6 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer3::AlteonAD' if $desc =~ /Alteon\s[1A][8D]/;
         # Nortel Contivity
         $objtype = 'SNMP::Info::Layer3::Contivity' if $desc =~ /\bCES\b/;
-        # Cisco PIX
-        $objtype = 'SNMP::Info::Layer3::Cisco' if ($desc =~ /Cisco PIX Security Appliance/i);
-        # Cisco ASA
-        $objtype = 'SNMP::Info::Layer3::Cisco' if ($desc =~ /Cisco Adaptive Security Appliance/i);
 
         # Allied Telesyn Layer2 managed switches. They report they have L3 support
         $objtype = 'SNMP::Info::Layer2::Allied' if ($desc =~ /Allied.*AT-80\d{2}\S*/i);
@@ -1103,6 +1101,10 @@ sub device_type {
         $objtype = 'SNMP::Info::Layer2::Aruba' if ($desc =~ /(ArubaOS|AirOS)/);
         #Juniper NetScreen
         $objtype = 'SNMP::Info::Layer3::Netscreen' if ($desc =~ /NetScreen/i);
+        # Cisco PIX
+        $objtype = 'SNMP::Info::Layer3::Cisco' if ($desc =~ /Cisco PIX Security Appliance/i);
+        # Cisco ASA
+        $objtype = 'SNMP::Info::Layer3::Cisco' if ($desc =~ /Cisco Adaptive Security Appliance/i);
     }   
 
     return $objtype;