From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 4 Oct 2007 06:52:52 +0000 (-0400)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P81~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa168f1e39e8ed6e8cc29a953e2cb0cc6603bffd;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/kardel/main-line/ntp-dev

bk: 47048dc4xl-GHYU2Zx6WUIJ0nJDhJA
---

fa168f1e39e8ed6e8cc29a953e2cb0cc6603bffd
diff --cc ChangeLog
index 9f2418743,ea896a46a..68a314ba8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,5 +1,10 @@@
 +* ntpd/ntp_timer.c: add missing sys_tai parameter for debug printf
 +* [Bug 917] config parse leaves files open
- * [Bug 912] detect conflicting enable/disable configuration on interfaces sharing an IP address
++* [Bug 912] detect conflicting enable/disable configuration on interfaces
++  sharing an IP address
 +* [Bug 771] compare scopeid if available for IPv6 addresses
+ * Lose obsolete crypto subcommands (Dave Mills).
+ * WWV is an HF source, not an LF source (Dave Mills).
  * [Bug 899] Only show -i/--jaildir -u/--user options if we HAVE_DROPROOT.
  * [Bug 916] 'cryptosw' is undefined if built without OpenSSL.
  * [Bug 891] 'restrict' config file keyword does not work (partial fix).