Merge bk://bk2.ntp.org./ntp-dev

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

bk: 4d9e6d4cQG1xGVWO7ZaK_AG7loknRg

diff --cc ChangeLog
index f14eacf7d4d6b65e4f329afb28d5cb6e71d102aa,634de51c6027af1193b6a6e86a39041da52cef08..78fcb7150be88fb025a0306602b3dc5244de5c27
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,6 -1,9 +1,12 @@@
+ * Use _mkgmtime() as timegm() in the Windows port, rather than
+   libntp/mktime.c's timegm().  Fixed [Bug 1875] on Windows using the old
+   asn2ntp() code from before 4.2.7p147.
+ * ntp_crypto.c string buffer safety.
+ * Remove use of MAXFILENAME in mode 7 (ntpdc) on-wire structs.
+ * Change ntpd MAXFILENAME from 128 to 256 to match ntp-keygen.
 +(4.2.7p147) 2011/04/07 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1875] 'asn2ntp()' rewritten with 'caltontp()'; 'timegm()'
 +  substitute likely to crash with 64bit time_t.
  (4.2.7p146) 2011/04/05 Released by Harlan Stenn <stenn@ntp.org>
  * String buffer safety cleanup, converting to strlcpy() and strlcat().
  * Use utmpname() before pututline() so repeated steps do not

diff --cc ntpd/ntp_crypto.c
Simple merge