Merge psp-at1.ntp.org:/home/perlinger/ntp-stable-2814

into  psp-at1.ntp.org:/a/local/amd/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-p6+

bk: 56976eb8zzBMcU1EiD2oMLhKLitsag

diff --cc ChangeLog
index 0c69148db72fbadf2bd75beaa874870e951a8427,0a5f270b81908869d306dd08c6234c4752663056..1f59dc19a86ac8614456e50284a82d3995dfd827
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -17,11 -32,9 +32,11 @@@
  * CID 1341681: Nits in sntp/tests/keyFile.c.  HStenn.
  * CID 1341682: Nit in libntp/authreadkeys.c.  HStenn.
  * CID 1341684: Nit in tests/ntpd/t-ntp_signd.c.  HStenn.
 +* [Bug 2814] msyslog deadlock when signaled. perlinger@ntp.org
 +  - applied patch by shenpeng11@huawei.com with minor adjustments
  * [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
+   - fudge stratum should only accept values [0..16]. perlinger@ntp.org
  * [Bug 2932] Update leapsecond file info in miscopt.html.  CWoodbury, HStenn.
  * [Bug 2934] tests/ntpd/t-ntp_scanner.c has a magic constant wired in.  HMurray
  * [Bug 2944] errno is not preserved properly in ntpdate after sendto call.