Removed suffix of "-rate" and let user decide label via --label

[nagiosplug.git] / plugins-scripts / check_ifoperstatus.pl

diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl
index e137e7fd8e20fc95594b80aa47389ef98d4672ad..588993be9613656ba535576c1dc57f3cae47fe5e 100755 (executable)
--- a/plugins-scripts/check_ifoperstatus.pl
+++ b/plugins-scripts/check_ifoperstatus.pl
@@ -308,7 +308,7 @@ sub print_help() {
        printf "   -X (--privpass)   privacy password (cleartext ascii or localized key\n";
        printf "                     in hex with 0x prefix generated by using \"snmpkey\" utility\n"; 
        printf "                     privacy password and authEngineID\n";
-       printf "   -x (--privproto)  privacy protocol (DES or AES; default: DES)\n";
+       printf "   -P (--privproto)  privacy protocol (DES or AES; default: DES)\n";
        printf "   -k (--key)        SNMP IfIndex value\n";
        printf "   -d (--descr)      SNMP ifDescr value\n";
        printf "   -T (--type)       SNMP ifType integer value (see http://www.iana.org/assignments/ianaiftype-mib)\n";
@@ -342,7 +342,7 @@ sub process_arguments() {
                        "U=s" => \$secname,   "secname=s"   => \$secname,
                        "A=s" => \$authpass,  "authpass=s"  => \$authpass,
                        "X=s" => \$privpass,  "privpass=s"  => \$privpass,
-                       "x=s" => \$privproto,  "privproto=s"  => \$privproto,
+                       "P=s" => \$privproto,  "privproto=s"  => \$privproto,
                        "c=s" => \$context,   "context=s"   => \$context,
                        "k=i" => \$snmpkey, "key=i",\$snmpkey,
                        "d=s" => \$ifdescr, "descr=s" => \$ifdescr,
@@ -379,10 +379,10 @@ sub process_arguments() {
        }
 
        unless ($snmpkey > 0 || defined $ifdescr || defined $iftype){
-               usage("Either a valid snmpkey key (-k) or a ifDescr (-d) must be provided");
+               usage("Either a valid snmp key (-k) or a ifDescr (-d) must be provided");
        }
 
-       if (defined $name) {
+       if (defined $ifName) {
                $ifXTable=1;
        }       
 
@@ -420,7 +420,7 @@ sub process_arguments() {
                
                        # Must define a security level even though defualt is noAuthNoPriv
                        unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) {
-                               usage("Must define a security level even though default is noAuthNoPriv");
+                               usage("Must define a valid security level even though default is noAuthNoPriv");
                        }
                        
                        # Authentication wanted