merge cleanup

bk: 565ece31YD-a7VrDzd0oYcofQGrlDw

diff --git a/ChangeLog b/ChangeLog
index 35ea2f532c078f3c43f024c6d1f111d2609723c2..9851d1b27dc26dff97b88d3c33d2bf7c61127a9b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@ Below are from 4.2.8p5:
 * [Bug 2829] Look at pipe_fds in ntpd.c  (did so. perlinger@ntp.org)
 * [Bug 2887] stratum -1 config results as showing value 99
   - 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
 (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.