From: Dave Hart <hart@ntp.org>
Date: Mon, 30 Nov 2009 07:51:56 +0000 (+0000)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P250_RC~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7088de066231aca92b62bba3210683fe66fac7a1;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1391-7

bk: 4b13799chGZzXhM4O-yo86Bay3zaUw
---

7088de066231aca92b62bba3210683fe66fac7a1
diff --cc ChangeLog
index 307ef2b6b,7322dd9a0..03fbab7f9
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,5 -1,7 +1,9 @@@
 -* [Bug 1386] Deferred DNS doesn't work on NetBSD
+ * [Bug 761] internal resolver does not seem to honor -4/-6 qualifiers
 -*  Pass no_needed to ntp_intres as first part of fixing Bug 975.
 -*  Add --enable-force-defer-DNS to help debugging.
++* [Bug 1386] Deferred DNS doesn't work on NetBSD
 +* [Bug 1391] avoid invoking autogen twice for .c and .h files.
 +* [Bug 1397] shmget() refclock_shm failing because of file mode.
++* Pass no_needed to ntp_intres as first part of fixing [Bug 975].
++* Add ./configure --enable-force-defer-DNS to help debugging.
  (4.2.5p249-RC) 2009/11/28 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1400] An empty KOD DB file causes sntp to coredump.
  * sntp: documentation cleanup.