[Bug 2326] Improve stale leapsecond notifications

bk: 528c7946TCmhw6ODDKFhE21o7jrtDg

diff --git a/ChangeLog b/ChangeLog
index 8568bd2aab14f718f185d11ac6833b1a6ded9e07..24edbaf581211be4bf58fc25ffee275c60b348d5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+* [Bug 2326] More leapsecond file notification cleanup.
 (4.2.7p396) 2013/11/19 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 2326] Improve stale leapsecond notifications.
 (4.2.7p395) 2013/11/12 Released by Harlan Stenn <stenn@ntp.org>

diff --git a/ntpd/ntp_io.c b/ntpd/ntp_io.c
index 4ec67c8d87b6cc5dd1cd7936e3c2809e8ea95017..cd4d871cb3f4550d2b94a74659d815f8dcf736cc 100644 (file)
--- a/ntpd/ntp_io.c
+++ b/ntpd/ntp_io.c
@@ -3738,8 +3738,14 @@ input_handler(
        /* We're done... */
     ih_return:
        if (check_leapfile < time(NULL)) {
+               int rc;
+
                check_leapfile += CHECK_LEAP_EVERY;
-               (void)check_leap_file();
+               rc = check_leap_file();
+
+               if (rc < 31)
+                       msyslog(LOG_DEBUG,
+                               "input_handler: check_leap_file() returned %d.' time!", rc);
        }
        return;
 }

diff --git a/ntpd/ntp_timer.c b/ntpd/ntp_timer.c
index 35562bc37ac54ca7c596515088e831892950a52f..ee2575705571b669301ab87ad2f5e4371e1b5efd 100644 (file)
--- a/ntpd/ntp_timer.c
+++ b/ntpd/ntp_timer.c
@@ -436,13 +436,12 @@ timer(void)
                                report_event(EVNT_LEAPVAL, NULL, NULL);
                                if (leap_warn_log == FALSE) {
                                        msyslog(LOG_WARNING,
-                                               "leapseconds data file has expire!.");
+                                               "timer: leapseconds data file has expired!");
                                        leap_warn_log = TRUE;
                                }
                        } else if (clf < 31) {
                                msyslog(LOG_WARNING,
-                                       "leapseconds data file will expire in about %d days' time!", clf);
-                               /* squawk that leapfile will expire */
+                                       "timer: leapseconds data file will expire in about %d days' time!", clf);
                        }
                } else
                        leap_warn_log = FALSE;