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

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

bk: 4657df88oofi8tDk6TAipKVhPwdzHA

diff --cc ChangeLog
index 39e1810b9671c7f18ebe04f5810ce63fe9047f83,149ab5c508940811c955399040be4e0488a6bde3..4c1a807a4173b84223a10b574b99ffb08cc45e27
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,47 -1,6 +1,49 @@@
 +* [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 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.4p2) Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 527] Don't write from source address length to wrong location
+ * Upgraded autogen and libopts.
  * [Bug 811] ntpd should not read a .ntprc file.
  (4.2.4p1) (skipped)
  (4.2.4p0) Released by Harlan Stenn <stenn@ntp.org>

diff --cc NEWS
Simple merge

diff --cc include/recvbuff.h
Simple merge

diff --cc ports/winnt/ntpd/ntp_iocompletionport.c
index c78c8610a54010c08a4706534fcca8bea1c42581,39ae4f15ae9363e356fed23a90b3771e4d89d58b..4d190dec9f2e8ddc2cdea0d3e4d1bafda1847079
--- 1/ports/winnt/ntpd/ntp_iocompletionport.c
--- 2/ports/winnt/ntpd/ntp_iocompletionport.c
+++ b/ports/winnt/ntpd/ntp_iocompletionport.c
@@@ -501,20 -529,8 +529,23 @@@ OnSocketRecv(DWORD i, IoCompletionInfo 
                        freerecvbuf(buff);
                }
        }
++
 +      QueueSocketRecv(inter->fd, newbuff, lpo);
 +      /*
 +       * Now signal we have something to process
 +       */
 +      if (newbuff != buff) {
 +              if( !SetEvent( WaitableIoEventHandle ) ) {
 +#ifdef DEBUG
 +                      if (debug > 3) {
 +                              printf( "Error %d setting IoEventHandle\n", GetLastError() );
 +                      }
 +#endif
 +              }
 +      }
 +
+       if (newbuff != NULL)
+               QueueSocketRecv(inter->fd, newbuff, lpo);
        return 1;
  }