From: Harlan Stenn <stenn@ntp.org>
Date: Sat, 14 Apr 2018 08:54:50 +0000 (+0000)
Subject: Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3449
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2be173b52dba24bbb57b5fb6250369ccbdc9e0ba;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:/home/perlinger/ntp-stable-3449
into  psp-deb1.ntp.org:/net/nfs1/nfs/home/stenn/ntp-stable

bk: 5ad1c1dab62GU-fn_ku1PaH6n-Gd9g
---

2be173b52dba24bbb57b5fb6250369ccbdc9e0ba
diff --cc ChangeLog
index 24b371b6a,fcc54fc4e..8651807fb
--- a/ChangeLog
+++ b/ChangeLog
@@@ -27,8 -27,10 +27,12 @@@
    - initial patch by Hal Murray; also fixed refclock_report() trouble
  * [Bug 3456] Use uintptr_t rather than size_t to store an integer in a pointer
    - According to Brooks Davis, there was only one location <perlinger@ntp.org>
 +* [Bug 3449] ntpq - display "loop" instead of refid [...] <perlinger@ntp.org>
 +  - applied patch by Gerry Garvey
+ * [Bug 3434] ntpd clears STA_UNSYNC on start <perlinger@ntp.org>
+   - applied patch by Miroslav Lichvar
+ * [Bug 3121] Drop root privileges for the forked DNS worker <perlinger@ntp.org>
+   - integrated patch by  Reinhard Max
  * [Bug 2821] minor build issues <perlinger@ntp.org>
    - applied patches by Christos Zoulas, including real bug fixes