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

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

bk: 5ad1bdc42gqsUzXV75H9bzRYBSvZUw
---

086f5068fc35d2c4ff5e7bf573c212cf221acfc4
diff --cc ChangeLog
index 823949fd2,323c27b8a..fcc54fc4e
--- a/ChangeLog
+++ b/ChangeLog
@@@ -27,8 -27,8 +27,10 @@@
    - 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 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