Change the order of OID's used in snmpfinger for cisco NASes

diff --git a/dialup_admin/Changelog b/dialup_admin/Changelog
index 87bda0e..600a0da 100644 (file)
--- a/dialup_admin/Changelog
+++ b/dialup_admin/Changelog
@@ -11,6 +11,7 @@ Ver 1.80:
 * In time2strclock also show days if applicable
 * In lib/sql/attrmap.php3, only register variables once. Go through $show_attrs and set default attribute
   mappings for any attribute that a mapping does not exist.
+* Change the order of OID's used in snmpfinger for cisco NASes
 Ver 1.78:
 * Add a snmp_clearsession which can disconnect a user by using the Cisco AAA Session MIB
 * Add a configuration directive general_sessionclear_bin

diff --git a/dialup_admin/bin/snmpfinger b/dialup_admin/bin/snmpfinger
index 789a2a3..5fd04a0 100755 (executable)
--- a/dialup_admin/bin/snmpfinger
+++ b/dialup_admin/bin/snmpfinger
@@ -25,9 +25,11 @@ $snmpwalkcmd="$snmpwalk -v 1 -c $comm $host" if ($snmp_type = 'net');
 
 if ($type eq 'cisco'){
        $walk =`$snmpwalkcmd  .iso.org.dod.internet.private.enterprises.9.9.150.1.1.3.1.2`;
-       if ($walk =~ /^$/){
-               $walk =`$snmpwalkcmd .iso.org.dod.internet.private.enterprises.9.2.9.2.1.18`;
-               $walk.=`$snmpwalkcmd .iso.org.dod.internet.private.enterprises.9.10.19.1.3.1.1.3`;
+       if ($walk =~ /^$/ || $walk =~ /No Such Object/){
+               $walk =`$snmpwalkcmd .iso.org.dod.internet.private.enterprises.9.10.19.1.3.1.1.3`;
+               if ($walk =~ /^$/ || $walk =~ /No Such Object/){
+                       $walk =`$snmpwalkcmd .iso.org.dod.internet.private.enterprises.9.2.9.2.1.18`;
+               }
        }
 }
 elsif ($type eq 'lucent'){