From: Dave Hart <hart@ntp.org>
Date: Fri, 8 Apr 2011 02:05:00 +0000 (+0000)
Subject: Merge bk://bk2.ntp.org./ntp-dev
X-Git-Tag: NTP_4_2_7P148~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ac1ae0ff54992e0b534e1731efd8910ab09881a;p=thirdparty%2Fntp.git

Merge bk://bk2.ntp.org./ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-strlcpy

bk: 4d9e6d4cQG1xGVWO7ZaK_AG7loknRg
---

9ac1ae0ff54992e0b534e1731efd8910ab09881a
diff --cc ChangeLog
index f14eacf7d,634de51c6..78fcb7150
--- a/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