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

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1166-7-9

bk: 49f7ebd0zit1v882IBCNpRSXi69UUQ

diff --cc ChangeLog
index fa4505f7209401cf76c5283cef6842f017291cca,85665a77d8c8ed78de3129f13669b562e986b184..9e564992c7074f03f2893e294bed8652c1101c7d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -2,8 -2,12 +2,14 @@@
  * 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.
 +* m4/ntp_lineeditlibs.m4: fix warnings from newer Autoconf
 +* Remove truncation of position (blanking) code in refclock_nmea.c
  (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>