From: Harlan Stenn <stenn@ntp.org>
Date: Sun, 25 Jan 2015 02:17:02 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Tag: NTP_4_2_8P1~4
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=484fc44844356e4af6abf57641469a77a692407a;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-fb1.ntp.org:/a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2671

bk: 54c4521etOFSkr-HUz72BLuvAOqclg
---

484fc44844356e4af6abf57641469a77a692407a
diff --cc ChangeLog
index cb0e33fad,55c2fcbe0..da4e458b7
--- a/ChangeLog
+++ b/ChangeLog
@@@ -3,8 -4,8 +4,9 @@@
  * Start the RC for 4.2.8p1.
  * [Bug 2187] Update version number generation scripts.
  * [Bug 2617] Fix sntp Usage documentation section.
 +* [Sec 2671] vallen in extension fields are not validated.
  * [Sec 2672] Code cleanup: On some OSes ::1 can be spoofed...
+ * [Bug 2736] Show error message if we cannot open the config file.
  * Copyright update.
  * Fix the package name.
  ---