From: Harlan Stenn <stenn@ntp.org>
Date: Thu, 26 Nov 2009 06:04:33 +0000 (-0500)
Subject: Merge bk://www.ntp.org/ntp-dev
X-Git-Tag: NTP_4_2_5P250_RC~6^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=93a095bc7c1e1ef7e09e79976bf8100ca11e6263;p=thirdparty%2Fntp.git

Merge bk://www.ntp.org/ntp-dev
into  pogo.udel.edu:/pogo/users/murray/bug-1397

bk: 4b0e1a71uCXgGxX3KfPni-52aq29Pw
---

93a095bc7c1e1ef7e09e79976bf8100ca11e6263
diff --cc ChangeLog
index 2e96bac71,c122d04d9..64e76f6d5
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,4 +1,9 @@@
+ * [Bug 1397] shmget() refclock_shm failing because of file mode
 +* [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.
 +* [Bug 1392] intres retries duplicate assocations endlessly.
 +* Correct *-opts.h dependency so default 'get' action isn't used.
  (4.2.5p247-RC) 2009/11/20 Released by Harlan Stenn <stenn@ntp.org>
  * [Bug 1142] nodebug builds shed no light on -d, -D option failure.
  * [Bug 1179] point out the problem with -i/--jaildir and -u/--user when