Merge whimsy.udel.edu:/deacon/backroom/ntp-stable

into  whimsy.udel.edu:/deacon/backroom/ntp-dev

bk: 46837053hKScj-4l1lQE7Em9DbNmwQ

diff --cc ChangeLog
index 78fde708bd1c8a69576218b24c6281f053f043ed,d9bafe0e4735d4722c101ef659bb13c4235d4975..02f2ab9d1c3f25ded1eeec2010c4be818eb083c2
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,78 -1,4 +1,79 @@@
 +* More assertion checks and malloc()->emalloc(), courtesy of Calysto.
 +* [Bug 864] Place ntpd service in maintenance mode if using SMF on Solaris
 +* [Bug 862] includefile nesting; preserve phonelist on reconfig.
 +* [Bug 604] ntpd regularly dies on linux/alpha.
 +* more leap second infrastructure fixes from Dave Mills.
 +* [Bug 858] recent leapfile changes broke non-OpenSSL builds.
 +* Use emalloc() instead of malloc() in refclock_datum.c (Calysto).
 +* Start using 'design by contract' assertions.
 +* [Bug 767] Fast sync to refclocks wanted.
 +* Allow null driftfile.
 +* Use YYERROR_VERBOSE for the new parser, and fix related BUILT_SOURCES.
 +* [Bug 629] changes to ensure broadcast works including on wildcard addresses
 +* [Bug 853] get_node() must return a pointer to maximally-aligned memory.
 +* Initial leap file fixes from Dave Mills.
 +* [Bug 858] Recent leapfile changes broke without OPENSSL.
 +* Use a char for DIR_SEP, not a string.
 +* [Bug 850] driftfile parsing changes.
 +* driftfile maintenance changes from Dave Mills.  Use clock_phi instead of
 +  stats_write_tolerance.
 +* [Bug 828] refid string not being parsed correctly.
 +* [Bug 846] Correct includefile parsing.
 +* [Bug 827] New parsing code does not handle "fudge" correctly.
 +* Enable debugging capability in the config parser.
 +* [Bug 839] Crypto password not read from ntp.conf.
 +* Have autogen produce writable output files.
 +* [Bug 825] Correct logconfig -/+ keyword processing.
 +* [Bug 828] Correct parsing of " delimited strings.
 +* Cleanup FILE * usage after fclose() in ntp_filegen.c.
 +* [Bug 843] Windows Completion port code was incorrectly merged from -stable.
 +* [Bug 841] make deferred binding to local interface the default.
 +          (allows peers/servers to be configured even when no route exists)
 +* [Bug 840] do fudge configuration AFTER peers (thus refclocks) have been
 +          configured.
 +* [Bug 824] Added new parser modules to the Windows project file.
 +* [Bug 832] Add libisc/log.c headers to the distribution.
 +* [Bug 808] Only write the drift file if we are in state 4.
 +* Initial import of libisc/log.c and friends.
 +* [Bug 826] Fix redefinition of PI.
 +* [Bug 825] ntp_scanner.c needs to #include <config.h> .
 +* [Bug 824] New parser code has some build problems with the SIM code.
 +* [Bug 817] Use longnames for setting ntp variables on the command-line;
 +          Allowing '-v' with and without an arg to disambiguate usage
 +          is error-prone.
 +* [Bug 822] set progname once, early.
 +* [Bug 819] remove erroneous #if 0 in Windows completion port code.
 +* The new config code missed an #ifdef for building without refclocks.
 +* Distribute some files needed by the new config parsing code.
 +* [Bug 819] Timeout for WaitForMultipleObjects was 500ms instead of INFINITE
 +* Use autogen 5.9.1.
 +* Fix clktest command-line arg processing.'
 +* Audio documentation updates from Dave Mills.
 +* New config file parsing code, from Sachin Kamboj.
 +* fuzz bit cleanup from Dave Mills.
 +* replay cleanup from Dave Mills.
 +* [Bug 542] Tolerate missing directory separator at EO statsdir.
 +* [Bug 812] ntpd should drop supplementary groups.
 +* [Bug 815] Fix warning compiling 4.2.5p22 under Windows with VC6.
 +* [Bug 740] Fix kernel/daemon startup drift anomaly.
 +* refclock_wwv.c fixes from Dave Mills.
 +* [Bug 810] Fix ntp-keygen documentation.
 +* [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.4p3)
  * [Bug 863] unable to stop ntpd on Windows as the handle reference for events
            changed
  (4.2.4p2) Released by Harlan Stenn <stenn@ntp.org>

diff --cc NEWS
index 8d748795d7e267e4a3b78e267a5605487852e811,5e1dabfeede6215bb8f9f84ef3608e3c6fdcdd42..26cd37e97f569ce16aeb7762f64ff958534d7113
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -1,10 -1,11 +1,18 @@@
 +ntpd now syncs to refclocks right away.
 +
 +Backward-Incomatible changes:
 +
 +ntpd no longer accepts '-v name' or '-V name' to define internal variables.
 +Use '--var name' or '--dvar name' instead. (Bug 817)
 +---
+ NTP 4.2.4p3 (Harlan Stenn <stenn@ntp.org>, 2007/06/xx)
+ 
+ Focus: Minor Bugfixes
+ 
+ This release fixes a bug in Windows that made it difficult to
+ terminate ntpd under windows.
+ This is a recommended upgrade for Windows.
+ ---
  NTP 4.2.4p2 (Harlan Stenn <stenn@ntp.org>, 2007/06/19)
  
  Focus: Minor Bugfixes