From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 12 Apr 2016 08:18:50 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8fbbdddb2fdc2dcc1bfc753a6ac4fae709d86353;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/stenn/ntp-stable
into  psp-deb1.ntp.org:/home/stenn/ntp-stable-p7

bk: 570caf6aKH9dd37W08uGDyG-bD0Wzw
---

8fbbdddb2fdc2dcc1bfc753a6ac4fae709d86353
diff --cc ChangeLog
index 5165c17ab,a99c3a9fe..69b7ce6ae
--- a/ChangeLog
+++ b/ChangeLog
@@@ -38,9 -22,12 +40,14 @@@
    - reduced number of error branches (authreadkeys.c)
  * [Bug 3023] ntpdate cannot correct dates in the future. perlinger@ntp.org
  * [Bug 3030] ntpq needs a general way to specify refid output format.  HStenn.
+ * [Bug 3031] ntp broadcastclient unable to synchronize to an server
+              when the time of server changed. perlinger@ntp.org
+   - Check the initial delay calculation and reject/unpeer the broadcast
+     server if the delay exceeds 50ms. Retry again after the next
+     broadcast packet.
  * Document ntp.key's optional IP list in authenetic.html.  Harlan Stenn.
 +* Update html/xleave.html documentation.  Harlan Stenn.
 +* Update ntp.conf documentation.  Harlan Stenn.
  * Fix some Credit: attributions in the NEWS file.  Harlan Stenn.
  * Fix typo in html/monopt.html.  Harlan Stenn.
  * Add README.pullrequests.  Harlan Stenn.