13 files changed, 36 insertions, 33 deletions

diff --git a/plugins-scripts/check_breeze.pl b/plugins-scripts/check_breeze.pl
index 05b99203..531625c4 100755
--- a/plugins-scripts/check_breeze.pl
+++ b/plugins-scripts/check_breeze.pl
@@ -14,8 +14,9 @@ sub print_help ();
 sub print_usage ();
 
 $ENV{'PATH'}='@TRUSTED_PATH@';
-$ENV{'BASH_ENV'}=''; 
+$ENV{'BASH_ENV'}='';
 $ENV{'ENV'}='';
+$ENV{'CDPATH'}='';
 
 Getopt::Long::Configure('bundling');
 GetOptions
diff --git a/plugins-scripts/check_disk_smb.pl b/plugins-scripts/check_disk_smb.pl
index 15d16340..f4d33a7b 100644
--- a/plugins-scripts/check_disk_smb.pl
+++ b/plugins-scripts/check_disk_smb.pl
@@ -28,7 +28,7 @@ use FindBin;
 use lib "$FindBin::Bin";
 use utils qw($TIMEOUT %ERRORS &print_revision &support &usage);
 
-# make us session leader which makes all childs exit if we do
+# make us session leader which makes all children exit if we do
 setsid;
 
 sub print_help ();
diff --git a/plugins-scripts/check_ifoperstatus.pl b/plugins-scripts/check_ifoperstatus.pl
index c190ce95..e335cdad 100755
--- a/plugins-scripts/check_ifoperstatus.pl
+++ b/plugins-scripts/check_ifoperstatus.pl
@@ -134,7 +134,7 @@ if (defined $ifdescr || defined $iftype) {
         }
         if ($status==0) {
                 $state = "UNKNOWN";
-                printf "$state: could not retrive ifdescr/iftype snmpkey - $status-$snmpkey\n";
+                printf "$state: could not retrieve ifdescr/iftype snmpkey - $status-$snmpkey\n";
                 $session->close;
                 exit $ERRORS{$state};
         }
@@ -187,7 +187,7 @@ if (defined $ifXTable) {
          $name = $response->{$snmpIfDescr} ;
 }
 
-## if AdminStatus is down - some one made a consious effort to change config
+## if AdminStatus is down - some one made a conscious effort to change config
 ##
 if ( not ($response->{$snmpIfAdminStatus} == 1) ) {
         $answer = "Interface $name (index $snmpkey) is administratively down.";
@@ -286,7 +286,7 @@ sub print_usage() {
         printf "check_ifoperstatus -k <IF_KEY> -H <HOSTNAME> [-C <community>]\n";
         printf "Copyright (C) 2000 Christoph Kron\n";
         printf "check_ifoperstatus.pl comes with ABSOLUTELY NO WARRANTY\n";
-        printf "This programm is licensed under the terms of the ";
+        printf "This program is licensed under the terms of the ";
         printf "GNU General Public License\n(check source code for details)\n";
         printf "\n\n";
 }
@@ -424,7 +424,7 @@ sub process_arguments() {
                 if (defined $seclevel && defined $secname) {
                         $session_opts{'-username'} = $secname;
                 
-                        # Must define a security level even though defualt is noAuthNoPriv
+                        # Must define a security level even though default is noAuthNoPriv
                         unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) {
                                 usage("Must define a valid security level even though default is noAuthNoPriv");
                         }
diff --git a/plugins-scripts/check_ifstatus.pl b/plugins-scripts/check_ifstatus.pl
index 32984e53..38b87fcc 100755
--- a/plugins-scripts/check_ifstatus.pl
+++ b/plugins-scripts/check_ifstatus.pl
@@ -354,7 +354,7 @@ sub process_arguments() {
                 if (defined $seclevel && defined $secname) {
                         $session_opts{'-username'} = $secname;
                 
-                        # Must define a security level even though defualt is noAuthNoPriv
+                        # Must define a security level even though default is noAuthNoPriv
                         unless ( grep /^$seclevel$/, qw(noAuthNoPriv authNoPriv authPriv) ) {
                                 usage("Must define a valid security level even though default is noAuthNoPriv");
                         }
diff --git a/plugins-scripts/check_ircd.pl b/plugins-scripts/check_ircd.pl
index d869ae7b..84f20229 100755
--- a/plugins-scripts/check_ircd.pl
+++ b/plugins-scripts/check_ircd.pl
@@ -60,7 +60,7 @@ sub print_usage ();
 sub connection ($$$$);
 sub bindRemote ($$);
 
-# -------------------------------------------------------------[ Enviroment ]--
+# -------------------------------------------------------------[ Environment ]--
 
 $ENV{'PATH'}='@TRUSTED_PATH@';
 $ENV{'BASH_ENV'}=''; 
@@ -208,7 +208,7 @@ MAIN:
 
         # Just in case of problems, let's not hang the monitoring system
         $SIG{'ALRM'} = sub {
-                print "Somthing is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
+                print "Something is Taking a Long Time, Increase Your TIMEOUT (Currently Set At $TIMEOUT Seconds)\n";
                 exit $ERRORS{"UNKNOWN"};
         };
         
diff --git a/plugins-scripts/check_log.sh b/plugins-scripts/check_log.sh
index c623a8d6..8ecdd316 100755
--- a/plugins-scripts/check_log.sh
+++ b/plugins-scripts/check_log.sh
@@ -105,11 +105,11 @@ while test -n "$1"; do
     case "$1" in
         -h | --help)
             print_help
-            exit "$STATE_OK"
+            exit "$STATE_UNKNOWN"
             ;;
         -V | --version)
             print_revision "$PROGNAME" "$REVISION"
-            exit "$STATE_OK"
+            exit "$STATE_UNKNOWN"
             ;;
         -F | --filename)
             logfile=$2
diff --git a/plugins-scripts/check_mailq.pl b/plugins-scripts/check_mailq.pl
index f02c90fb..49156af3 100755
--- a/plugins-scripts/check_mailq.pl
+++ b/plugins-scripts/check_mailq.pl
@@ -4,7 +4,7 @@
 #   transmittal.  
 #
 # Initial version support sendmail's mailq command
-#  Support for mutiple sendmail queues (Carlos Canau)
+#  Support for multiple sendmail queues (Carlos Canau)
 #  Support for qmail (Benjamin Schmid)
 
 # License Information:
diff --git a/plugins-scripts/check_oracle.sh b/plugins-scripts/check_oracle.sh
index b14ec50e..59981386 100755
--- a/plugins-scripts/check_oracle.sh
+++ b/plugins-scripts/check_oracle.sh
@@ -86,20 +86,20 @@ esac
 # Information options
 case "$cmd" in
 --help)
-                print_help
-    exit "$STATE_OK"
+    print_help
+    exit "$STATE_UNKNOWN"
     ;;
 -h)
-                print_help
-    exit "$STATE_OK"
+    print_help
+    exit "$STATE_UNKNOWN"
     ;;
 --version)
-                print_revision "$PROGNAME" "$REVISION"
-    exit "$STATE_OK"
+    print_revision "$PROGNAME" "$REVISION"
+    exit "$STATE_UNKNOWN"
     ;;
 -V)
-                print_revision "$PROGNAME" "$REVISION"
-    exit "$STATE_OK"
+    print_revision "$PROGNAME" "$REVISION"
+    exit "$STATE_UNKNOWN"
     ;;
 esac
 
diff --git a/plugins-scripts/check_rpc.pl b/plugins-scripts/check_rpc.pl
index 47d6e49e..8a56b9fc 100755
--- a/plugins-scripts/check_rpc.pl
+++ b/plugins-scripts/check_rpc.pl
@@ -5,7 +5,7 @@
 # usage:
 #    check_rpc host service
 #
-# Check if an rpc serice is registered and running
+# Check if an rpc service is registered and running
 # using rpcinfo - $proto $host $prognum 2>&1 |";
 #
 # Use these hosts.cfg entries as examples
diff --git a/plugins-scripts/check_sensors.sh b/plugins-scripts/check_sensors.sh
index 921e7b36..866e0e0f 100755
--- a/plugins-scripts/check_sensors.sh
+++ b/plugins-scripts/check_sensors.sh
@@ -26,19 +26,19 @@ print_help() {
 case "$1" in
         --help)
                 print_help
-                exit "$STATE_OK"
+                exit "$STATE_UNKNOWN"
                 ;;
         -h)
                 print_help
-                exit "$STATE_OK"
+                exit "$STATE_UNKNOWN"
                 ;;
         --version)
                 print_revision "$PROGNAME" "$REVISION"
-                exit "$STATE_OK"
+                exit "$STATE_UNKNOWN"
                 ;;
         -V)
                 print_revision "$PROGNAME" "$REVISION"
-                exit "$STATE_OK"
+                exit "$STATE_UNKNOWN"
                 ;;
         *)
                 sensordata=$(sensors 2>&1)
diff --git a/plugins-scripts/check_uptime.pl b/plugins-scripts/check_uptime.pl
index f9542872..d73e40e1 100755
--- a/plugins-scripts/check_uptime.pl
+++ b/plugins-scripts/check_uptime.pl
@@ -110,7 +110,7 @@ $pretty_uptime .= sprintf( "%d week%s, ",   $weeks, $weeks == 1 ? "" : "s" )  if
 $pretty_uptime .= sprintf( "%d day%s, ",    $days,  $days  == 1 ? "" : "s" )  if  $days;
 $pretty_uptime .= sprintf( "%d hour%s, ",   $hours, $hours == 1 ? "" : "s" )  if  $hours;
 $pretty_uptime .= sprintf( "%d minute%s, ", $mins,  $mins  == 1 ? "" : "s" )  if  $mins;
-# Replace last occurence of comma with "and"
+# Replace last occurrence of comma with "and"
 $pretty_uptime =~ s/, $/ and /;
 # Always print the seconds (though it may be 0 seconds)
 $pretty_uptime .= sprintf( "%d second%s", $secs, $secs == 1 ? "" : "s" );
diff --git a/plugins-scripts/check_wave.pl b/plugins-scripts/check_wave.pl
index 41e15f50..c24015c0 100755
--- a/plugins-scripts/check_wave.pl
+++ b/plugins-scripts/check_wave.pl
@@ -19,6 +19,7 @@ sub print_usage ();
 $ENV{'PATH'}='@TRUSTED_PATH@';
 $ENV{'BASH_ENV'}='';
 $ENV{'ENV'}='';
+$ENV{'CDPATH'}='';
 
 Getopt::Long::Configure('bundling');
 GetOptions
@@ -50,34 +51,34 @@ my $critical = $1 if ($opt_c =~ /([0-9]+)/);
 ($opt_w) || ($opt_w = shift) || ($opt_w = 60);
 my $warning = $1 if ($opt_w =~ /([0-9]+)/);
 
-$low1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
+$low1 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
 @test = split(/ /,$low1);
 $low1 = $test[2];
 
-$med1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
+$med1 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
 @test = split(/ /,$med1);
 $med1 = $test[2];
 
-$high1 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
+$high1 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
 @test = split(/ /,$high1);
 $high1 = $test[2];
 
 sleep(2);
 
-$snr = `snmpget $host public .1.3.6.1.4.1.762.2.5.2.1.17.1`;
+$snr = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.762.2.5.2.1.17.1`;
 @test = split(/ /,$snr);
 $snr = $test[2];
 $snr = int($snr*25);
 
-$low2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
+$low2 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.8.1`;
 @test = split(/ /,$low2);
 $low2 = $test[2];
 
-$med2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
+$med2 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.9.1`;
 @test = split(/ /,$med2);
 $med2 = $test[2];
 
-$high2 = `snmpget $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
+$high2 = `$utils::PATH_TO_SNMPGET $host public .1.3.6.1.4.1.74.2.21.1.2.1.10.1`;
 @test = split(/ /,$high2);
 $high2 = $test[2];
 
diff --git a/plugins-scripts/utils.pm.in b/plugins-scripts/utils.pm.in
index 386831eb..c84769fb 100644
--- a/plugins-scripts/utils.pm.in
+++ b/plugins-scripts/utils.pm.in
@@ -23,6 +23,7 @@ $PATH_TO_LMSTAT  = "@PATH_TO_LMSTAT@" ;
 $PATH_TO_SMBCLIENT = "@PATH_TO_SMBCLIENT@" ;
 $PATH_TO_MAILQ   = "@PATH_TO_MAILQ@";
 $PATH_TO_QMAIL_QSTAT = "@PATH_TO_QMAIL_QSTAT@";
+$PATH_TO_SNMPGET = "@PATH_TO_SNMPGET@";
 
 ## common variables
 $TIMEOUT = 15;