Merge shiny.ad.hartbrothers.com:C:/ntp/ntp-dev

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1169

bk: 49f7eb8f39kWttYydzbNyh-hFMehUQ

diff --cc ChangeLog
index e4d7b5a043e5004a47c8c6b7aa8eb0b9f5844176,0d6703688569091756cb3ce31444c173b4352987..85665a77d8c8ed78de3129f13669b562e986b184
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,13 @@@
 +* [Bug 1169] quiet compiler warnings
 +* Re-enable gcc -Wstrict-prototypes when not building with OpenSSL
 +* Enable gcc -Wstrict-overflow
 +* ntpq/ntpdc emit newline after accepting password on Windows
+ * Updates from Dave Mills:
+ * ntp-keygen.c: Updates.
+ * Fix the error return and syslog function ID in refclock_{param,ppsapi}.
+ * Make sure syspoll is within the peer's minpoll/maxpoll bounds.
+ * ntp_crypto.c: Use sign_siglen, not len. sign key filename cleanup.
+ * Bump NTP_MAXEXTEN from 1024 to 2048, update values for some field lengths.
  (4.2.5p167) 2009/04/26 Released by Harlan Stenn <stenn@ntp.org>
  * Crypto cleanup from Dave Mills.
  (4.2.5p166) 2009/04/25 Released by Harlan Stenn <stenn@ntp.org>

diff --cc ntpd/ntp_refclock.c
index cd1e51f35b85d9469f0c43f533a48f5ec24474df,58e948f1827b6f1d848539f787cdb1ac80c41e33..f3dcdcfb0664f82768115cf5b42b38e353fa0adc
--- 1/ntpd/ntp_refclock.c
--- 2/ntpd/ntp_refclock.c
+++ b/ntpd/ntp_refclock.c
@@@ -1215,11 -1215,11 +1215,11 @@@ refclock_ppsapi
        struct refclock_atom *ap        /* atom structure pointer */
        )
  {
 -      if (ap->handle == NULL) {
 +      if (!ap->handle) {
                if (time_pps_create(fddev, &ap->handle) < 0) {
                        msyslog(LOG_ERR,
-                           "refclock_atom: time_pps_create failed: %m");
-                       return (errno);
+                           "refclock_ppsapi: time_pps_create: %m");
+                       return (0);
                }
        }
        return (1);

diff --cc util/ntp-keygen.c
Simple merge