From: Harlan Stenn Date: Wed, 22 Apr 2009 23:13:32 +0000 (-0400) Subject: Merge whimsy.udel.edu:/deacon/backroom/ntp-dev X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=40624281f6473ad93215fa28efa316dd228bee2b;p=thirdparty%2Fntp.git Merge whimsy.udel.edu:/deacon/backroom/ntp-dev into whimsy.udel.edu:/deacon/backroom/ntp-dev-samba bk: 49efa49cMUV6YjllcM86f5o9W61M8w --- 40624281f6473ad93215fa28efa316dd228bee2b diff --cc ChangeLog index da63b72b07,abe37f12d6..05c99b7175 --- a/ChangeLog +++ b/ChangeLog @@@ -1,4 -1,14 +1,15 @@@ +* [Bug 1028] Support for W32Time authentication via Samba. + * Mitigation and PPS/PPSAPI cleanup from Dave Mills. + * Documentation updates from Dave Mills. + * timepps-Solaris.h patches from Dave Hart. + (4.2.5p164) 2009/04/22 Released by Harlan Stenn + * PPS/PPSAPI cleanup from Dave Mills. + * Documentation updates from Dave Mills. + * [Bug 1125] C runtime per-thread initialization on Windows + * [Bug 1152] temporarily disable refclock_parse, refclock_true until + maintainers can repair build break from pps_sample() + * [Bug 1153] refclock_nmea should not mix UTC with GPS time + * [Bug 1159] ntpq overlap diagnostic message test buggy (4.2.5p163) 2009/04/10 Released by Harlan Stenn (4.2.5p162) 2009/04/09 Released by Harlan Stenn * Documentation updates from Dave Mills. diff --cc include/ntp.h index 702725f1b8,8bb6df1268..e74f5cfd91 --- a/include/ntp.h +++ b/include/ntp.h @@@ -445,10 -445,10 +445,11 @@@ struct peer #define FLAG_XLEAVE 0x1000 /* interleaved protocol */ #define FLAG_XB 0x2000 /* interleaved broadcast */ #define FLAG_XBOGUS 0x4000 /* interleaved bogus packet */ + #define FLAG_PPS 0x8000 /* steered by PPS */ #ifdef OPENSSL - #define FLAG_ASSOC 0x8000 /* autokey request */ + #define FLAG_ASSOC 0x10000 /* 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