From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 9 Nov 2009 09:46:54 +0000 (-0500)
Subject: Merge bk://maccarony/ntp-dev
X-Git-Tag: NTP_4_2_5P242_RC~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=329c462fd0c6d59aedfd2d7eb64dc3b557417667;p=thirdparty%2Fntp.git

Merge bk://maccarony/ntp-dev
into  pogo.udel.edu:/pogo/users/hart/ntp-dev-diet-rc-hms

bk: 4af7e50eqSTf4NXr5WXdFmoGUO2JLA
---

329c462fd0c6d59aedfd2d7eb64dc3b557417667
diff --cc ChangeLog
index 759970b26,0565233f0..0cd597b46
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,11 -1,5 +1,13 @@@
 +* [Bug 1363] CID 92 clarify fallthrough case in clk_trimtsip.c
 +* [Bug 1366] ioctl(TIOCSCTTY, 0) fails on NetBSD *[0-2].* > 3.99.7.
 +* [Bug 1368] typos in libntp --without-crypto case
 +* [Bug 1371] deferred DNS lookup failing with INFO_ERR_AUTH.
 +* CID 87 dead code in ntpq.c atoascii().
 +* Fix authenticated ntpdc, broken in p240.
 +* Stub out isc/mem.h, shaving 47k from a MIPS ntpd binary.
 +* Shrink keyword scanner FSM entries from 64 to 32 bits apiece.
+ * Documention updates from Dave Mills.
+ * authkeys.c cleanup from Dave Mills.
  (4.2.5p241-RC) 2009/11/07 Released by Harlan Stenn <stenn@ntp.org>
  * html/authopt.html update from Dave Mills.
  * Remove unused file from sntp/Makefile.am's distribution list.