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

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

bk: 49e549d64SNSnWZ4l013bAUzL4wdSw

diff --cc ChangeLog
index 102d0e9cc3b4cbd580e7d2a0dd0b6954cc7deca7,3ebfe866a9b389a897d30ed630635845898d7d45..da63b72b0761c97c9eff5daebfb12ef4cf414fe9
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,4 -1,24 +1,25 @@@
 +* [Bug 1028] Support for W32Time authentication via Samba.
+ (4.2.5p163) 2009/04/10 Released by Harlan Stenn <stenn@ntp.org>
+ (4.2.5p162) 2009/04/09 Released by Harlan Stenn <stenn@ntp.org>
+ * Documentation updates from Dave Mills.
+ * Mitigation and PPS cleanup from Dave Mills.
+ * Include (4.2.4p7-RC2)
+ * [Bug 216] New interpolation scheme for Windows eliminates 1ms jitter
+ * remove a bunch of #ifdef SYS_WINNT from portable code
+ * 64-bit time_t cleanup for building on newer Windows compilers
+ * Only set CMOS clock during ntpd exit on Windows if the computer is
+   shutting down or restarting.
+ * [Bug 1148] NMEA reference clock improvements
+ * remove deleted gsoc_sntp/utilities.o from repository so that .o build
+   products can be cleaned up without corrupting the repository.
+ (4.2.5p161) 2009/03/31 Released by Harlan Stenn <stenn@ntp.org>
+ * Documentation updates from Dave Mills.
+ (4.2.5p160) 2009/03/30 Released by Harlan Stenn <stenn@ntp.org>
+ * [Bug 1141] refclock_report missing braces cause spurious "peer event:
+   clock clk_unspec" log entries
+ * Include (4.2.4p7-RC1)
+ (4.2.5p159) 2009/03/28 Released by Harlan Stenn <stenn@ntp.org>
+ * "bias" changes from Dave Mills.
  (4.2.5p158) 2009/01/30 Released by Harlan Stenn <stenn@ntp.org>
  * Fix [CID 72], a typo introduced at the latest fix to prettydate.c.
  (4.2.5p157) 2009/01/26 Released by Harlan Stenn <stenn@ntp.org>

diff --cc include/ntp.h
index 889b37ae135bcb4bcd7205fb82f7e02227bd5c5e,55d7720767cbb5caa6fa5e166787cfdf23d19320..702725f1b8bc690ea5780fdbc345dcb7560bcad4
--- 1/include/ntp.h
--- 2/include/ntp.h
+++ b/include/ntp.h
@@@ -444,10 -444,10 +444,11 @@@ struct peer 
  #define FLAG_SKEY     0x0800  /* autokey authentication */
  #define       FLAG_XLEAVE     0x1000  /* interleaved protocol */
  #define       FLAG_XB         0x2000  /* interleaved broadcast */
+ #define       FLAG_XBOGUS     0x4000  /* interleaved bogus packet */
  #ifdef        OPENSSL
- #define FLAG_ASSOC    0x4000  /* autokey request */
+ #define FLAG_ASSOC    0x8000  /* autokey request */
  #endif /* OPENSSL */
 +#define FLAG_ADKEY      0x00010000      /* Authenticated (or wants reply to be authenticated) using AD authentication */
  
  /*
   * Definitions for the clear() routine.  We use memset() to clear

diff --cc include/ntpd.h
Simple merge

diff --cc ntpd/ntp_config.c
Simple merge

diff --cc ntpd/ntp_proto.c
Simple merge