1 files changed, 9 insertions, 5 deletions

diff --git a/plugins/check_ping.c b/plugins/check_ping.c
index 83b907e7..95ac7b44 100644
--- a/plugins/check_ping.c
+++ b/plugins/check_ping.c
@@ -1,9 +1,9 @@
 /*****************************************************************************
 * 
-* Nagios check_ping plugin
+* Monitoring check_ping plugin
 * 
 * License: GPL
-* Copyright (c) 2000-2007 Nagios Plugins Development Team
+* Copyright (c) 2000-2007 Monitoring Plugins Development Team
 * 
 * Description:
 * 
@@ -30,7 +30,7 @@
 
 const char *progname = "check_ping";
 const char *copyright = "2000-2007";
-const char *email = "devel@nagios-plugins.org";
+const char *email = "devel@monitoring-plugins.org";
 
 #include "common.h"
 #include "netutils.h"
@@ -482,7 +482,11 @@ run_ping (const char *cmd, const char *addr)
         /* check stderr, setting at least WARNING if there is output here */
         /* Add warning into warn_text */
         while (fgets (buf, MAX_INPUT_BUFFER - 1, child_stderr)) {
-                if (! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")) {
+                if (
+                        ! strstr(buf,"WARNING - no SO_TIMESTAMP support, falling back to SIOCGSTAMP")
+                        && ! strstr(buf,"Warning: time of day goes back")
+
+                ) {
                         if (verbose >= 3) {
                                 printf("Got stderr: %s", buf);
                         }
@@ -581,7 +585,7 @@ print_help (void)
   printf (" %s\n", "-L, --link");
   printf ("    %s\n", _("show HTML in the plugin output (obsoleted by urlize)"));
 
-        printf (UT_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
+        printf (UT_CONN_TIMEOUT, DEFAULT_SOCKET_TIMEOUT);
 
   printf ("\n");
         printf ("%s\n", _("THRESHOLD is <rta>,<pl>% where <rta> is the round trip average travel"));