negate: Fix not printing the real timeout in ALRM handler when timeout is left to...

diff --git a/NEWS b/NEWS
index cfc0a7c7f2a54b2f83f05f6e8da2e49f3217ef08..ccc3e07f223a82514418e039f323300cf6ae7c2d 100644 (file)
--- 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 0808b685481652b08dcdfb7f697aeba39a4e5f96..e8be83d76e05d59340d36a62b9e65568a42994f9 100644 (file)
--- 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");