From: Dave Hart <hart@ntp.org>
Date: Sat, 28 Nov 2009 21:13:25 +0000 (+0000)
Subject: Merge pogo:/usa/murray/bug-1397
X-Git-Tag: NTP_4_2_5P250_RC~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d57638f800c0e217ab4ec98c203b63590d10884b;p=thirdparty%2Fntp.git

Merge pogo:/usa/murray/bug-1397
into  shiny.ad.hartbrothers.com:C:/ntp/ntp-dev-1391-7

bk: 4b119275hJGMiB4Ww2eEdwcph4mWzA
---

d57638f800c0e217ab4ec98c203b63590d10884b
diff --cc ChangeLog
index c378f300e,efa5b2971..309cbf1bb
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,13 -1,4 +1,14 @@@
+ * [Bug 1397] shmget() refclock_shm failing because of file mode.
 +(4.2.5p249-RC) 2009/11/28 Released by Harlan Stenn <stenn@ntp.org>
 +* [Bug 1400] An empty KOD DB file causes sntp to coredump.
 +* sntp: documentation cleanup.
 +* sntp: clean up some error messages.
 +* sntp: Use the precision to control how many offset digits are shown.
 +* sntp: Show root dispersion.
 +* Cleanup from the automake/autoconf upgrades.
 +(4.2.5p248-RC) 2009/11/26 Released by Harlan Stenn <stenn@ntp.org>
 +* Prepare for the generation of sntp.html.
 +* Documentation changes from Dave Mills.
  * [Bug 1387] Storage leak in ntp_intres (minor).
  * [Bug 1389] buffer overflow in refclock_oncore.c
  * [Bug 1391] .texi usage text from installed, not built binaries.