From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 5 Oct 2015 10:55:32 +0000 (+0000)
Subject: Merge bk://bk.ntp.org/ntp-stable
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38ae17a7ec1de6b4dc8e94917fb7ca24512a44c1;p=thirdparty%2Fntp.git

Merge bk://bk.ntp.org/ntp-stable
into  psp-deb1.ntp.org:/home/perlinger/ntp-stable-2902

bk: 56125724Pe5aLStIaLBm6jVAAnvwrg
---

38ae17a7ec1de6b4dc8e94917fb7ca24512a44c1
diff --cc ChangeLog
index ae4fca08b,343834ce1..4bf945f8d
--- a/ChangeLog
+++ b/ChangeLog
@@@ -19,12 -16,12 +19,14 @@@
    be configured for the distribution targets.  Harlan Stenn.
  * [Bug 2883] ntpd crashes on exit with empty driftfile.  Miroslav Lichvar.
  * [Bug 2886] Mis-spelling: "outlyer" should be "outlier".  dave@horsfall.org
 +* [Bug 2888] streamline calendar functions.  perlinger@ntp.org
  * [Bug 2889] ntp-dev-4.3.67 does not build on Windows.  perlinger@ntp.org
  * [Bug 2890] Ignore ENOBUFS on routing netlink socket.  Konstantin Khlebnikov.
+ * [Bug 2902] configuration directives "pidfile" and "driftfile"
+   should be local-only. perlinger@ntp.org (patch by Miroslav Lichvar)
  * [Bug 2906] make check needs better support for pthreads.  Harlan Stenn.
  * [Bug 2907] dist* build targets require our libevent/ to be enabled.  HStenn.
 +* [Bug 2912] no munlockall() under Windows.  David Taylor, Harlan Stenn.
  * libntp/emalloc.c: Remove explicit include of stdint.h.  Harlan Stenn.
  * Put Unity CPPFLAGS items in unity_config.h.  Harlan Stenn.
  * tests/ntpd/g_leapsec.cpp typo fix.  Harlan Stenn.