From: Harlan Stenn <stenn@ntp.org>
Date: Mon, 3 Mar 2014 09:34:35 +0000 (-0500)
Subject: Merge psp-deb1.ntp.org:../perlinger/ntp-dev-2570
X-Git-Tag: NTP_4_2_7P429~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66eabf9131795657818c5570c6f4e14759faa78a;p=thirdparty%2Fntp.git

Merge psp-deb1.ntp.org:../perlinger/ntp-dev-2570
into  deacon.udel.edu:/deacon/backroom/ntp-dev

bk: 53144cab0Hyile0l9yeEo5WVLxwJww
---

66eabf9131795657818c5570c6f4e14759faa78a
diff --cc ChangeLog
index b31ceef4b,dc21e1501..6ccdf0bc8
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,8 +1,9 @@@
  * CID 1165098: Remove logically dead code from refclock_true.c.
 +* CID 1189401: Use INSIST() instead of a belt-and-suspenders pointer check.
  * In ntp_dir_sep.m4, we care about $host_os, not $target_os.
  * [Bug 2540] bootstrap script needs to 'touch' files in finer-grained groups.
+ * [Bug 2570] refuse to load leapsec file with bad/missing SHA1 hash
+   -- change reading the hash line code: NIST omits leading zeros.
  * [Bug 2576] refclock_gpsdjson.c doesn't compile if CLOCK_GPSDJSON is
    not enabled at configure time.
  (4.2.7p428) 2014/03/03 Released by Harlan Stenn <stenn@ntp.org>