[Nagiosplug-checkins] SF.net SVN: nagiosplug:[2176] nagiosplug/trunk

[dermoth at users.sourceforge.net]

Revision: 2176
          http://nagiosplug.svn.sourceforge.net/nagiosplug/?rev=2176&view=rev
Author:   dermoth
Date:     2009-03-20 06:29:12 +0000 (Fri, 20 Mar 2009)

Log Message:
-----------
negate: Fix not printing the real timeout in ALRM handler when timeout is left to default

From: Thomas Guyot-Sionnest <dermoth at aei.ca>

Modified Paths:
--------------
    nagiosplug/trunk/NEWS
    nagiosplug/trunk/plugins/negate.c

Modified: nagiosplug/trunk/NEWS
===================================================================
--- nagiosplug/trunk/NEWS	2009-03-20 05:22:16 UTC (rev 2175)
+++ nagiosplug/trunk/NEWS	2009-03-20 06:29:12 UTC (rev 2176)
@@ -25,6 +25,7 @@
 	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)

Modified: nagiosplug/trunk/plugins/negate.c
===================================================================
--- nagiosplug/trunk/plugins/negate.c	2009-03-20 05:22:16 UTC (rev 2175)
+++ nagiosplug/trunk/plugins/negate.c	2009-03-20 06:29:12 UTC (rev 2176)
@@ -67,6 +67,8 @@
 	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 @@
 
 	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");


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.