Merge deacon.udel.edu:/users/stenn/ntp-stable

into  deacon.udel.edu:/users/stenn/ntp-dev

bk: 4625e9601xg4-VpJS6MTPXDwusWjRg

diff --cc ChangeLog
index b8fbc42997dfb1aaaab1d5ab798c12e1e9278570,e255cdcbb14faafce28f4976d21b38438caa5cac..f6b1d71e9b8bd0a90c24709fe22fe1702bca7eb1
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,23 -1,5 +1,24 @@@
 +* refclock_wwv.c fixes from Dave Mills.
 +* [Bug 810] Fix ntp-keygen documentation.
 +* [Bug 789] Fix multicast client crypto authentication and make sure arriving
 +          multicast packets do not disturb the autokey dance.
 +* [Bug 787] Bug fixes for 64-bit time_t on Windows.
 +* [Bug 796] Clean up duplicate #defines in ntp_control.c.
 +* [Bug 569] Use the correct precision for the Leitch CSD-5300.
 +* [Bug 795] Moved declaration of variable to top of function.
 +* [Bug 798] ntpq [p typo crashes ntpq/ntpdc.
 +* [Bug 786] Fix refclock_bancomm.c on Solaris.
 +* [Bug 774] parsesolaris.c does not compile under the new Solaris.
 +* [Bug 782] Remove P() macros from Windows files.
 +* [Bug 778] ntpd fails to lock with drift=+500 when started with drift=-500.
 +* [Bug 592] Trimble Thunderbolt GPS support.
 +* IRIG, CHU, WWV, WWVB refclock improvements from Dave Mills.
 +* [Bug 757] Lose ULONG_CONST().
 +* [Bug 756] Require ANSI C (function prototypes).
 +* codec (audio) and ICOM changes from Dave Mills.
 +\f
  (4.2.4p1) Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 811] ntpd should not read a .ntprc file.
  * [Bug 793] Update Hans Lambermont's email address in ntpsweep.
  * [Bug 776] Remove unimplemented "rate" flag from ntpdate.
  * [Bug 586] Avoid lookups if AI_NUMERICHOST is set.

diff --cc clockstuff/Makefile.am
Simple merge

diff --cc include/Makefile.am
index c41c7dee60867451d89e8d9d2fbce9d444163b71,1fbe6fcfe35ff62bf0c081a5d456622a15ce2528..614d474f642b27381039bd84e8aa2531ad3426bb
--- 1/include/Makefile.am
--- 2/include/Makefile.am
+++ b/include/Makefile.am
@@@ -1,7 -1,7 +1,7 @@@
  #AUTOMAKE_OPTIONS = ../util/ansi2knr no-dependencies
 -AUTOMAKE_OPTIONS = ../util/ansi2knr
 +AUTOMAKE_OPTIONS = 
  ETAGS_ARGS = $(srcdir)/Makefile.am
- EXTRA_DIST = copyright.def debug-opt.def autogen-version.def version.def
+ EXTRA_DIST = autogen-version.def copyright.def debug-opt.def homerc.def version.def
  
  SUBDIRS = isc
  

diff --cc ntpd/Makefile.am
Simple merge

diff --cc ntpdc/Makefile.am
Simple merge

diff --cc ntpq/Makefile.am
Simple merge

diff --cc util/Makefile.am
Simple merge

diff --cc util/ntp-keygen-opts.def
Simple merge