From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 2 Dec 2015 11:13:42 +0000 (+0000)
Subject: Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2971
X-Git-Tag: NTP_4_3_85~2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6efcd96aafedfe9a9d51f853b5c0123f2527b0d0;p=thirdparty%2Fntp.git

Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2971
into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-2971

bk: 565ed266cUxatANu89XKVn3SUi5lvw
---

6efcd96aafedfe9a9d51f853b5c0123f2527b0d0
diff --cc ChangeLog
index 43991343e,bd0e8233e..1a23ab1ba
--- a/ChangeLog
+++ b/ChangeLog
@@@ -25,10 -20,10 +25,12 @@@
    - make sure SOCKET values are not truncated (win32-specific)
    - format string fixes
  * [Bug 2965] Local clock didn't work since 4.2.8p4.  Martin Burnicki.
 +* [Bug 2967] ntpdate command suffers an assertion failure
 +  - fixed ntp_rfc2553.c to return proper address length. perlinger@ntp.org
  * [Bug 2969]  Seg fault from ntpq/mrulist when looking at server with
                lots of clients. perlinger@ntp.org
+ * [Bug 2971] ntpq bails on ^C: select fails: Interrupted system call
+   - changed stacked/nested handling of CTRL-C. perlinger@ntp.org
  * Unity cleanup for FreeBSD-6.4.  Harlan Stenn.
  * Unity test cleanup.  Harlan Stenn.
  * Libevent autoconf pthread fixes for FreeBSD-10.  Harlan Stenn.