From: Dave Hart <hart@ntp.org>
Date: Wed, 21 Oct 2009 22:02:35 +0000 (+0000)
Subject: Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1353
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9662bb61310f5826bce34e5424c8bd24dcbf4af;p=thirdparty%2Fntp.git

Merge shiny.ad.hartbrothers.com:c:/ntp/ntp-dev-1353
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1343-53

bk: 4adf84fbQ6DJEYJa38OzKCsMZAwKDQ
---

e9662bb61310f5826bce34e5424c8bd24dcbf4af
diff --cc ChangeLog
index 4cd60244f8,04356b1a2c..bd006cac24
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,9 -1,4 +1,10 @@@
 +* [Bug 1343] ntpd/ntp_io.c close_fd() does not compile on Solaris 7.
+ * [Bug 1353] ntpq "rv 0 settimeofday" always shows UNKNOWN on unix.
 +* Do not attempt to execute built binaries from ntpd/Makefile when
 +  cross-compiling (keyword-gen and ntpd --saveconfigquit).
 +* sntp/main.c: Remove duplicate global adr_buf[] (also defined in
 +  networking.c) which Piotr Grudzinski identified breaking his build.
 +* Correct in6addr_any test in configure.ac to attempt link too.
  (4.2.5p235-RC) 2009/10/18 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1343] lib/isc build breaks on systems without IPv6 headers.
  (4.2.5p234-RC) 2009/10/16 Released by Harlan Stenn <stenn@ntp.org>