dsa-check-zone-rrsig-expiration-many: actually exit non-zero if there were warnings

diff --git a/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many b/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
index b97cb09..5d9342f 100755 (executable)
--- a/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
+++ b/dsa-nagios-checks/checks/dsa-check-zone-rrsig-expiration-many
@@ -189,7 +189,7 @@ for my $k (keys %$count) {
        @{$count->{$k}} = sort {$a cmp $b} @{$count->{$k}};
 }
 
-my $exit = 0;
+my $exit;
 my %state_mapping = (
        'unknown' => 255,
        'critical' => 2,
@@ -209,4 +209,4 @@ for my $state (sort {$state_mapping{$b} <=> $state_mapping{$a}} keys %state_mapp
 printf "unsigned: %d", scalar @{$count->{'unsigned'}};
 print "\n";
 print $_ for (@details);
-exit $exit;
+exit ((defined $exit) ? $exit : 0);

diff --git a/dsa-nagios-checks/debian/changelog b/dsa-nagios-checks/debian/changelog
index c293c65..dac13c9 100644 (file)
--- a/dsa-nagios-checks/debian/changelog
+++ b/dsa-nagios-checks/debian/changelog
@@ -17,6 +17,8 @@ dsa-nagios-checks (108+XXXX) UNRELEASED; urgency=medium
     to be on.
   * dsa-check-cert-expire-dir: add
   * dsa-check-raid-3ware: modernize
+  * dsa-check-zone-rrsig-expiration-many: actually exit non-zero if there were
+    warnings.
 
   [ Tollef Fog Heen ]
   * dsa-update-unowned-file-status: ignore fdescfs, used for /dev/fd on
@@ -29,7 +31,7 @@ dsa-nagios-checks (108+XXXX) UNRELEASED; urgency=medium
   * Add dsa-check-hpssacli, replaces hpacucli for new hosts.
   * dsa-check-hpssacli: accept 12.0Gbps as transfer speed for SAS
 
- -- Peter Palfrader <weasel@debian.org>  Mon, 08 Feb 2016 10:03:28 +0100
+ -- Peter Palfrader <weasel@debian.org>  Wed, 23 Mar 2016 08:55:04 +0100
 
 dsa-nagios-checks (108) unstable; urgency=medium