aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS1
-rw-r--r--THANKS.in1
-rw-r--r--plugins/check_time.c14
3 files changed, 9 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index eb84e0fa..88d8ea29 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,7 @@ This file documents the major additions and syntax changes between releases.
check_snmp now support Counter64
Fix compilation of check_ldap, check_radius and check_pgsql
check_load can optionally divide by number of cpus
+ Fix check_time returning wrong OK when time is before the epoch on some arch
1.4.8 11th April 2007
Respects --without-world-permissions for setuid plugins
diff --git a/THANKS.in b/THANKS.in
index f7562680..c9d604b4 100644
--- a/THANKS.in
+++ b/THANKS.in
@@ -216,3 +216,4 @@ Stefan Meier
Mark Favas
Felix Frank
Denis Knauf
+Matthias Flacke
diff --git a/plugins/check_time.c b/plugins/check_time.c
index d3af3b0c..581c42a3 100644
--- a/plugins/check_time.c
+++ b/plugins/check_time.c
@@ -49,8 +49,8 @@ enum {
#define UNIX_EPOCH 2208988800UL
-uint32_t server_time, raw_server_time;
-time_t diff_time;
+uint32_t raw_server_time;
+unsigned long server_time, diff_time;
int warning_time = 0;
int check_warning_time = FALSE;
int critical_time = 0;
@@ -166,9 +166,9 @@ main (int argc, char **argv)
else
diff_time = (unsigned long)end_time - server_time;
- if (check_critical_diff == TRUE && diff_time > (time_t)critical_diff)
+ if (check_critical_diff == TRUE && diff_time > critical_diff)
result = STATE_CRITICAL;
- else if (check_warning_diff == TRUE && diff_time > (time_t)warning_diff)
+ else if (check_warning_diff == TRUE && diff_time > warning_diff)
result = STATE_WARNING;
printf (_("TIME %s - %lu second time difference|%s %s\n"),
@@ -177,9 +177,9 @@ main (int argc, char **argv)
check_warning_time, (long)warning_time,
check_critical_time, (long)critical_time,
TRUE, 0, FALSE, 0),
- perfdata ("offset", (long)diff_time, "s",
- check_warning_diff, (long)warning_diff,
- check_critical_diff, (long)critical_diff,
+ perfdata ("offset", diff_time, "s",
+ check_warning_diff, warning_diff,
+ check_critical_diff, critical_diff,
TRUE, 0, FALSE, 0));
return result;
}