From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 2 Dec 2015 11:08:42 +0000 (+0000)
Subject: merge cleanup
X-Git-Tag: NTP_4_3_85~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2898232b31c16fa688998c7bcb3f1d03dee9c39;p=thirdparty%2Fntp.git

merge cleanup

bk: 565ed13aotY0rWFOuQ-kqFb6dWDjHQ
---

diff --git a/ChangeLog b/ChangeLog
index 4c70ff17f..4af76b9ff 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@ Below are from 4.2.8p5:
   - fudge stratum only accepts values [0..16]. perlinger@ntp.org
 * [Bug 2944] errno is not preserved properly in ntpdate after sendto call.
   - applied patch by Christos Zoulas.  perlinger@ntp.org
+* [Bug 2967] ntpdate command suffers an assertion failure
+  - fixed ntp_rfc2553.c to return proper address length. perlinger@ntp.org
 (4.3.84) 2015/11/26 Released by Harlan Stenn <stenn@ntp.org>
 Below are from 4.2.8p5:
 * Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.