Allow check_ifstatus to accept version=2c

diff --git a/NEWS b/NEWS
index 79ddc53527896de4a905f77ab955e1ef131839bc..dc2092dbe97d665b91e7291ce73298f3f004ce1e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -30,6 +30,7 @@ This file documents the major additions and syntax changes between releases.
        Fix parsing of multi-line strings in check_snmp (broken in 1.4.14) and enhance output in such case (#2832451)
        Fix detection of pst3 64-bit compile flags with Sun CC
        Fix cmd_run overwriting the environment, which would break some commands that needed it
+       Allow check_ifstatus to accept version=2c - used to only allow version=2 (Brian Landers)
        WARNINGS
        Updated developer documentation to say that performance labels should not have an equals sign or
        single quote in the label

diff --git a/THANKS.in b/THANKS.in
index 0b1dab6cb7365e017f7c708cefd0b091945671c7..6666de4fc7ea2496ef988a3c13ca2a4397a2b37c 100644 (file)
--- a/THANKS.in
+++ b/THANKS.in
@@ -264,3 +264,4 @@ Josip Rodin
 Dann Frazier
 Stephane Chazelas
 Craig Leres
+Brian Landers

diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl
index 22638234155115df299d6ce133a6f4715ada4085..63c71ffae957f9c9f5411f4bb2a649788af83607 100755 (executable)
--- a/plugins-scripts/check_ifstatus.pl
+++ b/plugins-scripts/check_ifstatus.pl
@@ -280,7 +280,7 @@ sub process_arguments() {
        $status = GetOptions(
                "V"   => \$opt_V, "version"    => \$opt_V,
                "h"   => \$opt_h, "help"       => \$opt_h,
-               "v=i" => \$snmp_version, "snmp_version=i"  => \$snmp_version,
+               "v=s" => \$snmp_version, "snmp_version=s"  => \$snmp_version,
                "C=s" => \$community,"community=s" => \$community,
                "L=s" => \$seclevel, "seclevel=s" => \$seclevel,
                "a=s" => \$authproto, "authproto=s" => \$authproto,
@@ -317,7 +317,10 @@ sub process_arguments() {
                $timeout = $TIMEOUT;
        }
 
-       if ($snmp_version !~ /[123]/){
+       # Net::SNMP wants an integer
+       $snmp_version = 2 if $snmp_version eq "2c";
+
+       if ($snmp_version !~ /^[123]$/){
                $state='UNKNOWN';
                print ("$state: No support for SNMP v$snmp_version yet\n");
                exit $ERRORS{$state};