From: Dave Hart <hart@ntp.org>
Date: Sun, 2 Oct 2011 22:20:49 +0000 (+0000)
Subject: Merge bk://bk.ntp.org./ntp-dev
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbedc145fdc72db47395dccf5ab4dd42b8a91ff0;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org./ntp-dev
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-2019

bk: 4e88e3c1wBtd3NsE0ir__ssrJ-zZ2Q
---

bbedc145fdc72db47395dccf5ab4dd42b8a91ff0
diff --cc ChangeLog
index 98afa629fd,3cec775ced..237eb38ff0
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,16 -1,4 +1,17 @@@
 +* [Bug 2019] Allow selection of cipher for private key files.
+ * Documentation updates from Dave Mills.
 +* ntp-keygen private key cipher default now triple-key triple DES CBC.
 +* ntp-keygen -M is intended to ignore all other defaults and
 +  options, so do not attempt to open existing Autokey host certificate
 +  before generating symmetric keys and terminating.
 +* Restore IFF, MV, and GQ identity parameter filename convention to
 +  ntpkey_<scheme>par_<group/host> in ntpd, matching ntp-keygen.
 +* Change some error logging to syslog to ignore logconfig mask, such
 +  as reporting PPSAPI failure in NMEA and WWVB refclocks.
 +* ntp-keygen on Windows XP and later systems will now create links
 +  expected by ntpd.  They are hardlinks on Windows, soft on POSIX.
 +* Conditionalize NMEA serial open message under clockevent.
 +* Send all peer variables to trappers in report_event().
  (4.2.7p217) 2011/09/29 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 2020] ntp-keygen -s no longer sets host in cert file name.
  * [Backward Incompatible] ntp-keygen -i option long name changed from