[Bug 2410] syslog an error message on panic exceeded.

Update email address.

bk: 63f3a7c6-f6HnWpA3YoGdRqfMiN6WA

diff --git a/ChangeLog b/ChangeLog
index e54cb490941e9e41e9a2f2b9e3fc29ae74437252..59a5dfe74f8f265ddde4194ac2bc8a0afe6b5bbb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 ---
 
+* [Bug 2410] syslog an error message on panic exceeded.
 * [Bug 3784] high-load ntpd on Windows deaf after enough ICMP TTL exceeded <hart@ntp.org>
 * [Bug 2525] Turn on automake subdir-objects across the project. <hart@ntp.org>
 * [Bug 3758] Provide a 'device' config statement for refclocks <perlinger@ntp.org> 

diff --git a/html/copyright.html b/html/copyright.html
index 93604b7d03684139fc43b3f8d7e128d206988c31..e28b976aa4e9c7c8c18a8fd6e19cb2810e8ab0d9 100644 (file)
--- a/html/copyright.html
+++ b/html/copyright.html
@@ -87,7 +87,7 @@
   <li><a href="mailto:%20duwe@immd4.informatik.uni-erlangen.de">Torsten Duwe &lt;duwe@immd4.informatik.uni-erlangen.de&gt;</a> Linux port</li>
   <li><a href="mailto:%20dennis@mrbill.canet.ca">Dennis Ferguson &lt;dennis@mrbill.canet.ca&gt;</a> foundation code for NTP Version 2 as specified in RFC-1119</li>
   <li><a href="mailto:%20jhay@icomtek.csir.co.za">John Hay &lt;jhay@icomtek.csir.co.za&gt;</a> IPv6 support and testing</li>
-  <li><a href="mailto:%20davehart@davehart.com">Dave Hart &lt;davehart@davehart.com&gt;</a> General maintenance, Windows port interpolation rewrite</li>
+  <li><a href="mailto:%20davehart@gmail.com">Dave Hart &lt;davehart@gmail.com&gt;</a> General maintenance, IPv6 cleanup, Windows PPSAPI</li>
   <li><a href="mailto:%20neoclock4x@linum.com">Claas Hilbrecht &lt;neoclock4x@linum.com&gt;</a> NeoClock4X clock driver</li>
   <li><a href="mailto:%20glenn@herald.usask.ca">Glenn Hollinger &lt;glenn@herald.usask.ca&gt;</a> GOES clock driver</li>
   <li><a href="mailto:%20iglesias@uci.edu">Mike Iglesias &lt;iglesias@uci.edu&gt;</a> DEC Alpha port</li>

diff --git a/ntpd/ntp_proto.c b/ntpd/ntp_proto.c
index 898ff73eecdd41fac545e9e1f76892495582092b..182bfc6124fa57060e6ce801fd95128650e34167 100644 (file)
--- a/ntpd/ntp_proto.c
+++ b/ntpd/ntp_proto.c
@@ -2886,6 +2886,7 @@ clock_update(
         * Clock exceeds panic threshold. Life as we know it ends.
         */
        case -1:
+               msyslog(LOG_ERR, "Clock offset exceeds panic threshold.");
 #ifdef HAVE_LIBSCF_H
                /*
                 * For Solaris enter the maintenance mode.
@@ -2899,10 +2900,13 @@ clock_update(
                        /*
                         * Sleep until SMF kills us.
                         */
+                       msyslog(LOG_ERR, "%s placed into maintenance. "
+                               "Set system clock by hand before clearing.");
                        for (;;)
                                pause();
                }
 #endif /* HAVE_LIBSCF_H */
+               msyslog(LOG_ERR, "Set system clock by hand.");
                exit (-1);
                /* not reached */