aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Thomas Guyot-Sionnest <dermoth@aei.ca> 2009-03-20 01:40:00 -0400
committerGravatar Thomas Guyot-Sionnest <dermoth@aei.ca> 2009-03-20 01:40:00 -0400
commit4142e178403483d6c1a27e765c0a86e77278c2d6 (patch)
treefaa92535217a63bcfb1d74512686b7347c8ce65d
parent31f2afcf4a88cc7bb3bff0e7e3e69a810d308634 (diff)
downloadmonitoring-plugins-4142e178403483d6c1a27e765c0a86e77278c2d6.tar.gz
negate: Fix not printing the real timeout in ALRM handler when timeout is left to default
-rw-r--r--NEWS1
-rw-r--r--plugins/negate.c4
2 files changed, 4 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index cfc0a7c7..ccc3e07f 100644
--- a/NEWS
+++ b/NEWS
@@ -25,6 +25,7 @@ This file documents the major additions and syntax changes between releases.
Fixed passing of quotes in OID for check_snmp (#1985230 - Jan Wagner, patch by John Barbuto)
Fixed check_http sending HTTP/1.0 with v1.1 headers (#2638765)
Fixed check_http not timing-out on redirects
+ Fixed negate not printing the real timeout in ALRM handler when left to default
1.4.13 25th Sept 2008
Fix Debian bug #460097: check_http --max-age broken (Hilko Bengen)
diff --git a/plugins/negate.c b/plugins/negate.c
index 0808b685..e8be83d7 100644
--- a/plugins/negate.c
+++ b/plugins/negate.c
@@ -67,6 +67,8 @@ main (int argc, char **argv)
bindtextdomain (PACKAGE, LOCALEDIR);
textdomain (PACKAGE);
+ timeout_interval = DEFAULT_TIMEOUT;
+
command_line = (char **) process_arguments (argc, argv);
/* Set signal handling and alarm */
@@ -242,7 +244,7 @@ print_help (void)
printf (_(UT_HELP_VRSN));
- printf (_(UT_TIMEOUT), DEFAULT_TIMEOUT);
+ printf (_(UT_TIMEOUT), timeout_interval);
printf (" %s\n", _("Keep timeout longer than the plugin timeout to retain CRITICAL status."));
printf(" -o, --ok=STATUS\n");