Merge pogo:/usa/clemens/ntp-dev-181

into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1196-pt2-1210-18-31

bk: 4a3afcddPANTUhVznjVDDj5hurBpMg

diff --cc ChangeLog
index 533072dcfb4ba940e41ea7f6c25db5ddee76e8b4,d3ea552c255c26a88e287f98f1bb1b554e910a56..898bea9e03c8bf72db6c4af7a2b97432d8764657
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,8 +1,21 @@@
 -* [Bug 1210] ONCORE driver terminates ntpd without logging a reason
 +* [Bug 1196] setsockopt(SO_EXCLUSIVEADDRUSE) can fail on Windows 2000
 +  and earlier with WSAINVAL, do not log a complaint in that case.
- * [Bug 1231] ntpsnmpd build fails after sockaddr union changes
++* [Bug 1210] ONCORE driver terminates ntpd without logging a reason.
+ * [Bug 1218] Correct comment in refclock_oncore on /etc/ntp.oncore*
+   configuration file search order.
+ * Change ONCORE driver to log using msyslog as well as to any
+   clockstats file.
++* [Bug 1231] ntpsnmpd build fails after sockaddr union changes.
 +(4.2.5p182) 2009/06/18 Released by Harlan Stenn <stenn@ntp.org>
 +* Add missing header dependencies to the ntpdc layout verification.
 +* prefer.html updates from Dave Mills.
 +* [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.
  (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