From: Dave Hart <hart@ntp.org>
Date: Sat, 7 Nov 2009 23:31:15 +0000 (+0000)
Subject: Merge pogo:/usa/murray/bug-1368
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=c954bb97c7bdbb91ba72226c0428e48c4149baaf;p=thirdparty%2Fntp.git

Merge pogo:/usa/murray/bug-1368
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1366-8

bk: 4af60343G5hZhFUl6d0uo6wkkj_0Dg
---

c954bb97c7bdbb91ba72226c0428e48c4149baaf
diff --cc ChangeLog
index ef95d0588a,3ed2cfb940..c3ee48ca5c
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,6 +1,7 @@@
+ * [Bug 1366] ioctl(TIOCSCTTY, 0) fails on NetBSD *[0-2].* > 3.99.7.
 +* [Bug 1368] typos in libntp --without-crypto case
+ * CID 87 dead code in ntpq.c atoascii().
+ * Fix authenticated ntpdc, broken in p240.
  (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.