===================================================================
RCS file: /cvs/nagios/check_hw_sensors/check_hw_sensors,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- nagios/check_hw_sensors/check_hw_sensors 2006/05/02 22:23:29 1.8
+++ nagios/check_hw_sensors/check_hw_sensors 2006/05/03 03:26:47 1.9
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-# $RedRiver: check_hw_sensors,v 1.7 2006/05/02 20:03:53 andrew Exp $
+# $RedRiver: check_hw_sensors,v 1.8 2006/05/02 21:23:29 andrew Exp $
########################################################################
# check_hw_sensors *** A nagios check for OpenBSD hw.sensors
#
@@ -65,7 +65,7 @@
}
if ($opt_V) {
- print_revision($PROGNAME,'$Revision: 1.8 $ ');
+ print_revision($PROGNAME,'$Revision: 1.9 $ ');
exit $ERRORS{'OK'};
}
@@ -160,8 +160,8 @@
if (NAGIOS_OUTPUT) {
print "$error (" . scalar(@{ $states{ $error } }) . ")";
unless ($error eq 'OK') {
- print '
';
- print map { " - $_
" } @{ $states{ $error } };
+ print '
';
+ print map { " - $_
" } @{ $states{ $error } };
}
} else {
print "$error (" . scalar(@{ $states{ $error } }) . "):\n";
@@ -293,7 +293,7 @@
$result = $errors{$code}
if ($c <= $data);
}
- } elsif (defined $check->{$code}) {
+ } elsif (@{ $check->{$code} }) {
my $matched = 0;
foreach my $c (@{ $check->{$code} }) {
$c =~ s/[^\d\.]//g;
@@ -361,7 +361,7 @@
$result = $errors{$code}
if ($c <= $data);
}
- } elsif (defined $check->{$code}) {
+ } elsif (@{ $check->{$code} }) {
my $matched = 0;
foreach my $c (@{ $check->{$code} }) {
@@ -393,7 +393,7 @@
$sensor->{'type'} eq 'drive' ||
$sensor->{'type'} eq 'indicator'
) {
- if (defined $check->{$code}) {
+ if (@{ $check->{$code} }) {
my $matched = 0;
foreach (@{ $check->{$code} }) {
if ($_ eq $sensor->{'data'}) {
@@ -444,6 +444,6 @@
EOL
- print_revision($PROGNAME, '$Revision: 1.8 $');
+ print_revision($PROGNAME, '$Revision: 1.9 $');
}