From: Dave Hart <hart@ntp.org>
Date: Thu, 18 Jun 2009 08:06:47 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=21cdbbcb49dd23915902dcc790e84ec99c4695e3;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-sockaddr-1205-15

bk: 4a39f597RQQU5FbFuM-iXolcU8dBCQ
---

21cdbbcb49dd23915902dcc790e84ec99c4695e3
diff --cc ChangeLog
index 497f5a1547,92ca4c40e9..99eaf48c72
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,4 +1,10 @@@
 +* [Bug 1205] Add ntpd --usepcc and --pccfreq options on Windows
 +* [Bug 1215] unpeer by association ID
 +* [Bug 1225] Broadcast address miscalculated on Windows 4.2.5p180
+ * [Bug 1229] autokey segfaults in cert_install().
 +* Use a union for structs sockaddr, sockaddr_storage, sockaddr_in, and
-   sockaddr_in6 to remove casts and enable type checking.  Collapse
-   some previously separate IPv4/IPv6 paths into a single codepath.
++sockaddr_in6 to remove casts and enable type checking.  Collapse
++some previously separate IPv4/IPv6 paths into a single codepath.
  (4.2.5p181) 2009/06/06 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1206] Required compiler changes for Windows
  * [Bug 1084] PPSAPI for ntpd on Windows with DLL backends