From: Harlan Stenn Date: Tue, 8 Dec 2009 12:45:28 +0000 (-0500) Subject: NTP_4_2_4P9_RC1 X-Git-Tag: NTP_4_2_4P9_RC1^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=406bb306ec034f452f7156ed03365be366a74f3a;p=thirdparty%2Fntp.git NTP_4_2_4P9_RC1 bk: 4b1e4a68Ub6uFZpheka7n8T-LwvqZQ --- diff --git a/ChangeLog b/ChangeLog index ff60adca6..b1a9423f9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ --- +(4.2.4p9-RC1) 2009/12/08 Released by Harlan Stenn * [Sec 1331] DoS with mode 7 packets - CVE-2009-3563. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 4bfcf455a..d37f87d12 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed Monday May 18, 2009 at 04:56:03 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:40:39 AM EST * From the definitions ntpd-opts.def * and the template file options * @@ -835,7 +835,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.4p7\n\ +"ntpd - NTP daemon program - Ver. 4.2.4p9-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL @@ -844,7 +844,7 @@ tSCC zBugsAddr[] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL tSCC zDetail[] = "\n\n"; tSCC zFullVersion[] = NTPD_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -914,7 +914,7 @@ DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); #endif /* defined(TEST_NTPD_OPTS) */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 92 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optmain.tpl near line 92 */ #if defined(TEST_NTPD_OPTS) /* TEST MAIN PROCEDURE: */ @@ -930,7 +930,7 @@ main( int argc, char** argv ) return res; } #endif /* defined TEST_NTPD_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 514 */ #if ENABLE_NLS #include diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 79a3f90f9..71a9c011d 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed Monday May 18, 2009 at 04:56:02 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:40:38 AM EST * From the definitions ntpd-opts.def * and the template file options * @@ -87,8 +87,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 32 -#define NTPD_VERSION "4.2.4p7" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p7" +#define NTPD_VERSION "4.2.4p9-RC1" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.4p9-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -319,7 +319,7 @@ typedef enum { ntpdOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdOptions.pUsageProc)( &ntpdOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/opthead.tpl near line 360 */ /* * * * * * * diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 6067226c9..7d4173cbd 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpd-opts.texi) # -# It has been AutoGen-ed Monday May 18, 2009 at 04:56:06 AM EDT +# It has been AutoGen-ed Tuesday December 8, 2009 at 07:40:40 AM EST # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -60,12 +60,15 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.5p172 +ntpd - NTP daemon program - Ver. 4.2.5p247-RC USAGE: ntpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution + - prohibits these options: + ipv6 -6 no ipv6 Force IPv6 DNS name resolution - - an alternate for ipv4 + - prohibits these options: + ipv4 -a no authreq Require crypto authentication - prohibits these options: authnoreq @@ -80,20 +83,24 @@ USAGE: ntpd [ - [] | --[@{=| @}] ]... - may appear multiple times -f Str driftfile frequency drift file name -g no panicgate Allow the first adjustment to be Big - -I Str interface Listen on the specified interface or IP + - may appear multiple times + -i --- jaildir built without --enable-clockctl or --enable-linuxcaps + -I Str interface Listen on an interface name or address - may appear multiple times -k Str keyfile path to symmetric keys -l Str logfile path to the log file - -L no novirtualips Do not listen to virtual IPs + -L no novirtualips Do not listen to virtual interfaces -n no nofork Do not fork -N no nice Run at high priority -p Str pidfile path to the PID file -P Num priority Process priority -q no quit Set the time and quit -r Str propagationdelay Broadcast/propagation delay + Str saveconfigquit Save parsed configuration and quit -s Str statsdir Statistics file location -t Str trustedkey Trusted key number - may appear multiple times + -u --- user built without --enable-clockctl or --enable-linuxcaps -U Num updateinterval interval in seconds between scans for new or dropped interfaces Str var make ARG an ntp variable (RW) - may appear multiple times @@ -101,7 +108,7 @@ USAGE: ntpd [ - [] | --[@{=| @}] ]... - may appear multiple times -x no slew Slew up to 600 seconds opt version Output version information and exit - -? no help Display usage information and exit + -? no help Display extended usage information and exit -! no more-help Extended usage information passed thru pager Options are specified by doubled hyphens and their name diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 26e2eccd0..56381d5f5 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-05-18 "( 4.2.4p7)" "Programmer's Manual" +.TH NTPD 1 2009-12-08 "( 4.2.4p9-RC1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed Monday May 18, 2009 at 04:56:05 AM EDT +.\" It has been AutoGen-ed Tuesday December 8, 2009 at 07:40:40 AM EST .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c index b6c32879b..bef53df7c 100644 --- a/ntpd/ntpdsim-opts.c +++ b/ntpd/ntpdsim-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.c) * - * It has been AutoGen-ed Monday May 18, 2009 at 04:56:08 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:40:42 AM EST * From the definitions ntpdsim-opts.def * and the template file options * @@ -1072,7 +1072,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDSIM"; tSCC zUsageTitle[] = -"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p7\n\ +"ntpdsim - NTP daemon simulation program - Ver. 4.2.4p9-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -1084,7 +1084,7 @@ tSCC zBugsAddr[] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL tSCC zDetail[] = "\n\n"; tSCC zFullVersion[] = NTPDSIM_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -1155,7 +1155,7 @@ DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); #endif /* defined(TEST_NTPDSIM_OPTS) */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 92 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optmain.tpl near line 92 */ #if defined(TEST_NTPDSIM_OPTS) /* TEST MAIN PROCEDURE: */ @@ -1171,7 +1171,7 @@ main( int argc, char** argv ) return res; } #endif /* defined TEST_NTPDSIM_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 514 */ #if ENABLE_NLS #include diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index d17c34048..5d3908fe6 100644 --- a/ntpd/ntpdsim-opts.h +++ b/ntpd/ntpdsim-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.h) * - * It has been AutoGen-ed Monday May 18, 2009 at 04:56:07 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:40:41 AM EST * From the definitions ntpdsim-opts.def * and the template file options * @@ -98,8 +98,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 43 -#define NTPDSIM_VERSION "4.2.4p7" -#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p7" +#define NTPDSIM_VERSION "4.2.4p9-RC1" +#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.4p9-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -390,7 +390,7 @@ typedef enum { ntpdsimOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdsimOptions.pUsageProc)( &ntpdsimOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/opthead.tpl near line 360 */ /* * * * * * * diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi index f938a8e57..671c892d3 100644 --- a/ntpd/ntpdsim-opts.texi +++ b/ntpd/ntpdsim-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpdsim-opts.texi) # -# It has been AutoGen-ed Monday May 18, 2009 at 04:56:11 AM EDT +# It has been AutoGen-ed Tuesday December 8, 2009 at 07:40:44 AM EST # From the definitions ntpdsim-opts.def # and the template file aginfo.tpl @end ignore @@ -69,7 +69,66 @@ This is the automatically generated usage text for ntpdsim: @exampleindent 0 @example -ntpdsim is unavailable - no --help +ntpd - NTP daemon program - Ver. 4.2.5p247-RC +USAGE: ntpdsim [ - [] | --[@{=| @}] ]... + Flg Arg Option-Name Description + -4 no ipv4 Force IPv4 DNS name resolution + - prohibits these options: + ipv6 + -6 no ipv6 Force IPv6 DNS name resolution + - prohibits these options: + ipv4 + -a no authreq Require crypto authentication + - prohibits these options: + authnoreq + -A no authnoreq Do not require crypto authentication + - prohibits these options: + authreq + -b no bcastsync Allow us to sync to broadcast servers + -c Str configfile configuration file name + -d no debug-level Increase output debug message level + - may appear multiple times + -D Str set-debug-level Set the output debug message level + - may appear multiple times + -f Str driftfile frequency drift file name + -g no panicgate Allow the first adjustment to be Big + - may appear multiple times + -i --- jaildir built without --enable-clockctl or --enable-linuxcaps + -I Str interface Listen on an interface name or address + - may appear multiple times + -k Str keyfile path to symmetric keys + -l Str logfile path to the log file + -L no novirtualips Do not listen to virtual interfaces + -n no nofork Do not fork + -N no nice Run at high priority + -p Str pidfile path to the PID file + -P Num priority Process priority + -q no quit Set the time and quit + -r Str propagationdelay Broadcast/propagation delay + Str saveconfigquit Save parsed configuration and quit + -s Str statsdir Statistics file location + -t Str trustedkey Trusted key number + - may appear multiple times + -u --- user built without --enable-clockctl or --enable-linuxcaps + -U Num updateinterval interval in seconds between scans for new or dropped interfaces + Str var make ARG an ntp variable (RW) + - may appear multiple times + Str dvar make ARG an ntp variable (RW|DEF) + - may appear multiple times + -x no slew Slew up to 600 seconds + opt version Output version information and exit + -? no help Display extended usage information and exit + -! no more-help Extended usage information passed thru pager + +Options are specified by doubled hyphens and their name +or by a single hyphen and the flag character. + +The following option preset mechanisms are supported: + - examining environment variables named NTPD_* + + + +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/ntpd/ntpdsim.1 b/ntpd/ntpdsim.1 index 9e4b1a9d4..94cc656f5 100644 --- a/ntpd/ntpdsim.1 +++ b/ntpd/ntpdsim.1 @@ -1,7 +1,7 @@ -.TH NTPDSIM 1 2009-05-18 "( 4.2.4p7)" "Programmer's Manual" +.TH NTPDSIM 1 2009-12-08 "( 4.2.4p9-RC1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdsim.1) .\" -.\" It has been AutoGen-ed Monday May 18, 2009 at 04:56:09 AM EDT +.\" It has been AutoGen-ed Tuesday December 8, 2009 at 07:40:43 AM EST .\" From the definitions ntpdsim-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index f2e7b4560..a80a237b0 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed Monday May 18, 2009 at 05:02:28 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:41:30 AM EST * From the definitions ntpdc-opts.def * and the template file options * @@ -462,7 +462,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p7\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.4p9-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -490,7 +490,7 @@ configuration options which can be specified at startup using\n\ ntpd's configuration file may also be specified at run time using\n\ [= prog-name =] .\n"; tSCC zFullVersion[] = NTPDC_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -560,7 +560,7 @@ DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); #endif /* defined(TEST_NTPDC_OPTS) */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 92 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optmain.tpl near line 92 */ #if defined(TEST_NTPDC_OPTS) /* TEST MAIN PROCEDURE: */ @@ -576,7 +576,7 @@ main( int argc, char** argv ) return res; } #endif /* defined TEST_NTPDC_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 514 */ #if ENABLE_NLS #include diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 0558be745..c33a54102 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed Monday May 18, 2009 at 05:02:28 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:41:30 AM EST * From the definitions ntpdc-opts.def * and the template file options * @@ -70,8 +70,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.4p7" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p7" +#define NTPDC_VERSION "4.2.4p9-RC1" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.4p9-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -190,7 +190,7 @@ typedef enum { ntpdcOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdcOptions.pUsageProc)( &ntpdcOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/opthead.tpl near line 360 */ /* * * * * * * diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 92d53c1a5..609ea1887 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpdc-opts.texi) # -# It has been AutoGen-ed Monday May 18, 2009 at 05:02:30 AM EDT +# It has been AutoGen-ed Tuesday December 8, 2009 at 07:41:32 AM EST # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -58,12 +58,15 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTP query program - Ver. 4.2.5p172 +ntpdc - vendor-specific NTP query program - Ver. 4.2.5p247-RC USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution + - prohibits these options: + ipv6 -6 no ipv6 Force IPv6 DNS name resolution - - an alternate for ipv4 + - prohibits these options: + ipv4 -c Str command run a command and exit - may appear multiple times -l no listpeers Print a list of the peers @@ -87,7 +90,7 @@ USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] - may appear multiple times -n no numeric numeric host addresses opt version Output version information and exit - -? no help Display usage information and exit + -? no help Display extended usage information and exit -! no more-help Extended usage information passed thru pager -> opt save-opts Save the option state to a config file -< Str load-opts Load options from a config file diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index f675ae709..5fdedfed9 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-05-18 "( 4.2.4p7)" "Programmer's Manual" +.TH NTPDC 1 2009-12-08 "( 4.2.4p9-RC1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed Monday May 18, 2009 at 05:02:29 AM EDT +.\" It has been AutoGen-ed Tuesday December 8, 2009 at 07:41:31 AM EST .\" From the definitions ntpdc-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c index 940c044b7..af0f0d4e2 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) * - * It has been AutoGen-ed Monday May 18, 2009 at 05:02:59 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:41:55 AM EST * From the definitions ntpq-opts.def * and the template file options * @@ -410,7 +410,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.4p7\n\ +"ntpq - standard NTP query program - Ver. 4.2.4p9-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -430,7 +430,7 @@ information about current state and/or changes in that state.\n\ The same formats are used in NTPv4, although some of the\n\ variables have changed and new ones added.\n"; tSCC zFullVersion[] = NTPQ_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -500,7 +500,7 @@ DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); #endif /* defined(TEST_NTPQ_OPTS) */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 92 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optmain.tpl near line 92 */ #if defined(TEST_NTPQ_OPTS) /* TEST MAIN PROCEDURE: */ @@ -516,7 +516,7 @@ main( int argc, char** argv ) return res; } #endif /* defined TEST_NTPQ_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 514 */ #if ENABLE_NLS #include diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 6d7b7a8c3..3e4575dd2 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * It has been AutoGen-ed Monday May 18, 2009 at 05:02:59 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:41:55 AM EST * From the definitions ntpq-opts.def * and the template file options * @@ -68,8 +68,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define NTPQ_VERSION "4.2.4p7" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p7" +#define NTPQ_VERSION "4.2.4p9-RC1" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.4p9-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -176,7 +176,7 @@ typedef enum { ntpqOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpqOptions.pUsageProc)( &ntpqOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/opthead.tpl near line 360 */ /* * * * * * * diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index eec98b86d..33484710e 100644 --- a/ntpq/ntpq-opts.texi +++ b/ntpq/ntpq-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpq-opts.texi) # -# It has been AutoGen-ed Monday May 18, 2009 at 05:03:01 AM EDT +# It has been AutoGen-ed Tuesday December 8, 2009 at 07:41:57 AM EST # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -46,12 +46,15 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.5p172 +ntpq - standard NTP query program - Ver. 4.2.5p247-RC USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution + - prohibits these options: + ipv6 -6 no ipv6 Force IPv6 DNS name resolution - - an alternate for ipv4 + - prohibits these options: + ipv4 -c Str command run a command and exit - may appear multiple times -d no debug-level Increase output debug message level @@ -66,8 +69,9 @@ USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] command peers -n no numeric numeric host addresses + no old-rv Always output status line with readvar opt version Output version information and exit - -? no help Display usage information and exit + -? no help Display extended usage information and exit -! no more-help Extended usage information passed thru pager -> opt save-opts Save the option state to a config file -< Str load-opts Load options from a config file diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index 9d2628117..3564f6e8a 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-05-18 "( 4.2.4p7)" "Programmer's Manual" +.TH NTPQ 1 2009-12-08 "( 4.2.4p9-RC1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed Monday May 18, 2009 at 05:03:00 AM EDT +.\" It has been AutoGen-ed Tuesday December 8, 2009 at 07:41:56 AM EST .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 98966dc9e..1e64add39 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -9,14 +9,14 @@ version=${proto}.${major}.${minor} # - Numeric values increment # - empty 'increments' to 1 # - NEW 'increments' to empty -point=8 +point=9 # Special. Normally unused. A suffix. #special=ag special= # [???] To start an RC cycle: RC->yes # To release from an RC cycle: rcpoint-> GO # ReleaseCandidate. 'yes' or 'no'. -releasecandidate=no +releasecandidate=yes #releasecandidate=no # ChangeLog tag CLTAG=NTP_4_2_0 @@ -27,5 +27,5 @@ CLTAG=NTP_4_2_0 # - - rcpoint gets set to 0 # - - releasecandidate gets set to no # - GRONK is for -dev -rcpoint= +rcpoint=1 #rcpoint=GRONK diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 1f87f457a..d0e0e23f0 100644 --- a/sntp/sntp-opts.c +++ b/sntp/sntp-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.c) * - * It has been AutoGen-ed Monday May 18, 2009 at 05:03:26 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:42:19 AM EST * From the definitions sntp-opts.def * and the template file options * @@ -513,7 +513,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.4p7\n\ +"sntp - standard SNTP program - Ver. 4.2.4p9-RC1\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -533,7 +533,7 @@ job.\n\ NTP is the Network Time Protocol (RFC 1305) and SNTP is the\n\ Simple Network Time Protocol (RFC 2030, which supersedes RFC 1769).\n"; tSCC zFullVersion[] = SNTP_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -584,7 +584,7 @@ doUsageOpt( { USAGE( EXIT_SUCCESS ); } -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 92 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optmain.tpl near line 92 */ #if defined(TEST_SNTP_OPTS) /* TEST MAIN PROCEDURE: */ @@ -600,7 +600,7 @@ main( int argc, char** argv ) return res; } #endif /* defined TEST_SNTP_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 514 */ #if ENABLE_NLS #include diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 22d6ff0e7..9a47488ee 100644 --- a/sntp/sntp-opts.h +++ b/sntp/sntp-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.h) * - * It has been AutoGen-ed Monday May 18, 2009 at 05:03:25 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:42:19 AM EST * From the definitions sntp-opts.def * and the template file options * @@ -147,8 +147,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define SNTP_VERSION "4.2.4p7" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p7" +#define SNTP_VERSION "4.2.4p9-RC1" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.4p9-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -251,7 +251,7 @@ typedef enum { sntpOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*sntpOptions.pUsageProc)( &sntpOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/opthead.tpl near line 360 */ /* * * * * * * diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 2c04f5515..ab07f5c12 100644 --- a/sntp/sntp-opts.texi +++ b/sntp/sntp-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (sntp-opts.texi) # -# It has been AutoGen-ed Monday May 18, 2009 at 05:03:28 AM EDT +# It has been AutoGen-ed Tuesday December 8, 2009 at 07:42:21 AM EST # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore @@ -46,7 +46,59 @@ This is the automatically generated usage text for sntp: @exampleindent 0 @example -sntp is unavailable - no --help +sntp - standard SNTP program - Ver. 4.2.5p247-RC +USAGE: sntp [ - [] | --[@{=| @}] ]... ... + Flg Arg Option-Name Description + -4 no ipv4 Force IPv4 DNS name resolution + - prohibits these options: + ipv6 + -6 no ipv6 Force IPv6 DNS name resolution + - prohibits these options: + ipv4 + -d no normalverbose Normal verbose + -K Str kod KoD history filename + -p no syslog Logging with syslog + - prohibits these options: + filelog + -l Str filelog Logging to specified logfile + - prohibits these options: + syslog + -s no settod Set (step) the time with settimeofday() + - prohibits these options: + adjtime + -j no adjtime Set (slew) the time with adjtime() + - prohibits these options: + settod + -b Str broadcast Use broadcasts to the address specified for synchronisation + -t Num timeout Specify the number of seconds to wait for broadcasts + -a Num authentication Enable authentication with the key keyno. This option is used as -a keyno + -k Str keyfile Specify a keyfile. SNTP will look in this file for the key specified with -a + opt version Output version information and exit + -? no help Display extended usage information and exit + -! no more-help Extended usage information passed thru pager + -> opt save-opts Save the option state to a config file + -< Str load-opts Load options from a config file + - disabled as --no-load-opts + - may appear multiple times + +Options are specified by doubled hyphens and their name +or by a single hyphen and the flag character. + +The following option preset mechanisms are supported: + - reading file /users/stenn/.ntprc + - reading file /deacon/backroom/snaps/ntp-stable/sntp/.ntprc + - examining environment variables named SNTP_* + +.I sntp +can be used as a SNTP client to query a NTP or SNTP server and either display +the time or set the local system's time (given suitable privilege). It can be +run as an interactive command or in a +.I cron +job. +NTP is the Network Time Protocol (RFC 1305) and SNTP is the +Simple Network Time Protocol (RFC 2030, which supersedes RFC 1769). + +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index f449f6bfb..ed569eb3f 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c) * - * It has been AutoGen-ed Monday May 18, 2009 at 05:03:35 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:42:25 AM EST * From the definitions ntp-keygen-opts.def * and the template file options * @@ -799,7 +799,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p7\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p9-RC1\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -813,7 +813,7 @@ tSCC zDetail[] = "\n\ If there is no new host key, look for an existing one.\n\ If one is not found, create it.\n"; tSCC zFullVersion[] = NTP_KEYGEN_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -937,7 +937,7 @@ doOptModulus( } #endif /* defined OPENSSL */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 92 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optmain.tpl near line 92 */ #if defined(TEST_NTP_KEYGEN_OPTS) /* TEST MAIN PROCEDURE: */ @@ -953,7 +953,7 @@ main( int argc, char** argv ) return res; } #endif /* defined TEST_NTP_KEYGEN_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/optcode.tpl near line 514 */ #if ENABLE_NLS #include diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index edbc9418a..16e244ee1 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h) * - * It has been AutoGen-ed Monday May 18, 2009 at 05:03:34 AM EDT + * It has been AutoGen-ed Tuesday December 8, 2009 at 07:42:25 AM EST * From the definitions ntp-keygen-opts.def * and the template file options * @@ -79,8 +79,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 24 -#define NTP_KEYGEN_VERSION "4.2.4p7" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p7" +#define NTP_KEYGEN_VERSION "4.2.4p9-RC1" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.4p9-RC1" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -286,7 +286,7 @@ typedef enum { ntp_keygenOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntp_keygenOptions.pUsageProc)( &ntp_keygenOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ +/* extracted from /usr/local/gnu/autogen-5.9.1/share/autogen/opthead.tpl near line 360 */ /* * * * * * * diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index d7b00c663..c206d3f30 100644 --- a/util/ntp-keygen-opts.texi +++ b/util/ntp-keygen-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.texi) # -# It has been AutoGen-ed Monday May 18, 2009 at 05:03:37 AM EDT +# It has been AutoGen-ed Tuesday December 8, 2009 at 07:42:27 AM EST # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore @@ -52,7 +52,7 @@ This is the automatically generated usage text for ntp-keygen: @exampleindent 0 @example Using OpenSSL version 90704f -ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p172 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p247-RC USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -c Str certificate certificate scheme @@ -67,7 +67,7 @@ USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... -i Str issuer-name set issuer name -M no md5key generate MD5 keys -m Num modulus modulus - it must lie in the range: 256 to 2048 + - it must be: 256 to 2048 -P no pvt-cert generate PC private certificate -p Str pvt-passwd output private password -q Str get-pvt-passwd input private password @@ -77,7 +77,7 @@ USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... -V Num mv-params generate MV parameters -v Num mv-keys update MV keys opt version Output version information and exit - -? no help Display usage information and exit + -? no help Display extended usage information and exit -! no more-help Extended usage information passed thru pager -> opt save-opts Save the option state to a config file -< Str load-opts Load options from a config file diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index a9bc8da06..b4f5b4efd 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-05-18 "(ntp 4.2.4p7)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-12-08 "(ntp 4.2.4p9-RC1)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Monday May 18, 2009 at 05:03:36 AM EDT +.\" It has been AutoGen-ed Tuesday December 8, 2009 at 07:42:26 AM EST .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"