From: Harlan Stenn Date: Tue, 11 May 2010 07:56:04 +0000 (-0400) Subject: NTP_4_2_6P2_RC3 X-Git-Tag: NTP_4_2_6P2_RC3^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f237476843b92e101ea03cad17bde18f3dbe3604;p=thirdparty%2Fntp.git NTP_4_2_6P2_RC3 bk: 4be90d94UVWYfCRe7cfP2r_7F0jcAw --- diff --git a/ChangeLog b/ChangeLog index c96367bf3..74205bd7a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ --- +(4.2.6p2-RC3) 2010/05/11 Released by Harlan Stenn * [Bug 1325] unreachable code in sntp recv_bcst_data(). * [Bug 1459] sntp MD5 authentication does not work with ntpd. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index f51bd4668..987962bbe 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 April 27, 2010 at 02:51:32 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:53:38 AM by AutoGen 5.10 * From the definitions ntpd-opts.def * and the template file options * @@ -956,7 +956,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.6p2-RC2\n\ +"ntpd - NTP daemon program - Ver. 4.2.6p2-RC3\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 95737eba8..7cb7909cd 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 April 27, 2010 at 02:51:32 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:53:38 AM by AutoGen 5.10 * From the definitions ntpd-opts.def * and the template file options * @@ -90,8 +90,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 35 -#define NTPD_VERSION "4.2.6p2-RC2" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.6p2-RC2" +#define NTPD_VERSION "4.2.6p2-RC3" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.6p2-RC3" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 688bd64bc..306204500 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 April 27, 2010 at 02:51:48 AM by AutoGen 5.10 +# It has been AutoGen-ed May 11, 2010 at 03:54:01 AM by AutoGen 5.10 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -63,7 +63,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.6p2-RC2 +ntpd - NTP daemon program - Ver. 4.2.6p2-RC3 USAGE: ntpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 68c2bb7c7..a6f3c23d5 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2010-04-27 "( 4.2.6p2-RC2)" "Programmer's Manual" +.TH NTPD 1 2010-05-11 "( 4.2.6p2-RC3)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed April 27, 2010 at 02:51:48 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 11, 2010 at 03:54:01 AM by AutoGen 5.10 .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index 16a823783..90d587024 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 April 27, 2010 at 02:51:53 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:54:07 AM by AutoGen 5.10 * From the definitions ntpdc-opts.def * and the template file options * @@ -452,7 +452,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p2-RC2\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p2-RC3\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index ab8ab3d1b..551927a64 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 April 27, 2010 at 02:51:53 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:54:07 AM by AutoGen 5.10 * 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.6p2-RC2" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.6p2-RC2" +#define NTPDC_VERSION "4.2.6p2-RC3" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.6p2-RC3" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 6698dfc88..2111d9734 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 April 27, 2010 at 02:52:03 AM by AutoGen 5.10 +# It has been AutoGen-ed May 11, 2010 at 03:54:17 AM by AutoGen 5.10 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -58,7 +58,7 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTP query program - Ver. 4.2.6p2-RC2 +ntpdc - vendor-specific NTP query program - Ver. 4.2.6p2-RC3 USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index 8c9a7deae..62ac37ea5 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2010-04-27 "( 4.2.6p2-RC2)" "Programmer's Manual" +.TH NTPDC 1 2010-05-11 "( 4.2.6p2-RC3)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed April 27, 2010 at 02:52:03 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 11, 2010 at 03:54:16 AM by AutoGen 5.10 .\" 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 36da242dd..fc5b526d1 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 April 27, 2010 at 02:52:04 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:54:17 AM by AutoGen 5.10 * From the definitions ntpq-opts.def * and the template file options * @@ -427,7 +427,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.6p2-RC2\n\ +"ntpq - standard NTP query program - Ver. 4.2.6p2-RC3\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 630133992..7339d4769 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 April 27, 2010 at 02:52:04 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:54:17 AM by AutoGen 5.10 * From the definitions ntpq-opts.def * and the template file options * @@ -69,8 +69,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 14 -#define NTPQ_VERSION "4.2.6p2-RC2" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.6p2-RC2" +#define NTPQ_VERSION "4.2.6p2-RC3" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.6p2-RC3" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index b8a15b5d3..0e6e54820 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 April 27, 2010 at 02:52:13 AM by AutoGen 5.10 +# It has been AutoGen-ed May 11, 2010 at 03:54:26 AM by AutoGen 5.10 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -47,7 +47,7 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.6p2-RC2 +ntpq - standard NTP query program - Ver. 4.2.6p2-RC3 USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index 385ea550e..b41800039 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2010-04-27 "( 4.2.6p2-RC2)" "Programmer's Manual" +.TH NTPQ 1 2010-05-11 "( 4.2.6p2-RC3)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed April 27, 2010 at 02:52:13 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 11, 2010 at 03:54:26 AM by AutoGen 5.10 .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c index 6b101b2a5..0b6ae86e7 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed April 29, 2010 at 07:33:02 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:54:27 AM by AutoGen 5.10 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -256,7 +256,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p2-RC2\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p2-RC3\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -268,7 +268,7 @@ tSCC zBugsAddr[] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL #define zDetail NULL tSCC zFullVersion[] = NTPSNMPD_FULL_VERSION; -/* extracted from /usr/local/share/autogen/optcode.tpl near line 495 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -324,7 +324,7 @@ doUsageOpt( (void)pOptions; USAGE( EXIT_SUCCESS ); } -/* extracted from /usr/local/share/autogen/optmain.tpl near line 109 */ +/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 109 */ #if defined(TEST_NTPSNMPD_OPTS) /* TEST MAIN PROCEDURE: */ @@ -339,7 +339,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPSNMPD_OPTS */ -/* extracted from /usr/local/share/autogen/optcode.tpl near line 627 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */ #if ENABLE_NLS #include diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index c03596d52..c038e4421 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed April 29, 2010 at 07:33:02 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:54:27 AM by AutoGen 5.10 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -63,8 +63,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 8 -#define NTPSNMPD_VERSION "4.2.6p2-RC2" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p2-RC2" +#define NTPSNMPD_VERSION "4.2.6p2-RC3" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p2-RC3" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -135,7 +135,7 @@ typedef enum { ntpsnmpdOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpsnmpdOptions.pUsageProc)( &ntpsnmpdOptions, c ) -/* extracted from /usr/local/share/autogen/opthead.tpl near line 409 */ +/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */ /* * * * * * * diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index 895c9ff61..111e5fbdb 100644 --- a/ntpsnmpd/ntpsnmpd-opts.texi +++ b/ntpsnmpd/ntpsnmpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.texi) # -# It has been AutoGen-ed April 29, 2010 at 07:33:08 AM by AutoGen 5.10 +# It has been AutoGen-ed May 11, 2010 at 03:54:27 AM by AutoGen 5.10 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -34,29 +34,7 @@ This is the automatically generated usage text for ntpsnmpd: @exampleindent 0 @example -ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p2-RC2 -USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... - Flg Arg Option-Name Description - -n no nofork Do not fork - -p no syslog Log to syslog() - Str agentxsocket The socket address ntpsnmpd uses to connect to net-snmpd - 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 /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/.ntprc - - reading file /a/etc/amd.stage/thump2-g3/export/ntp/home/stenn/ntp-stable-1512-38/ntpsnmpd/.ntprc - - examining environment variables named NTPSNMPD_* - -please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org +ntpsnmpd is unavailable - no --help @end example @exampleindent 4 diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index 128037148..f08336f4f 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2010-04-29 "( 4.2.6p2-RC2)" "Programmer's Manual" +.TH NTPSNMPD 1 2010-05-11 "( 4.2.6p2-RC3)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed April 29, 2010 at 07:33:08 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 11, 2010 at 03:54:27 AM by AutoGen 5.10 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index c97aa61dd..4aa7d1710 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -91,4 +91,4 @@ betapoint=0 # - - prerelease is emptied # else (not in RC) # - rcpoint is empty and unused (for now). -rcpoint=2 +rcpoint=3 diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 10f5411f7..4a8cb4f47 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 April 27, 2010 at 02:53:16 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:55:36 AM by AutoGen 5.10 * From the definitions sntp-opts.def * and the template file options * @@ -474,7 +474,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.6p2-RC2\n\ +"sntp - standard SNTP program - Ver. 4.2.6p2-RC3\n\ USAGE: %s [ - [] | --[{=| }] ]... hostname-or-IP ...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index e5cc47c38..b7cca126f 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 April 27, 2010 at 02:53:16 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:55:36 AM by AutoGen 5.10 * From the definitions sntp-opts.def * and the template file options * @@ -72,8 +72,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 17 -#define SNTP_VERSION "4.2.6p2-RC2" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.6p2-RC2" +#define SNTP_VERSION "4.2.6p2-RC3" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.6p2-RC3" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index e836d17f2..a982b7c34 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 April 27, 2010 at 02:53:20 AM by AutoGen 5.10 +# It has been AutoGen-ed May 11, 2010 at 03:55:44 AM by AutoGen 5.10 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore @@ -56,65 +56,7 @@ This is the automatically generated usage text for sntp: @exampleindent 0 @example -sntp - standard SNTP program - Ver. 4.2.6p2-RC2 -USAGE: sntp [ - [] | --[@{=| @}] ]... hostname-or-IP ... - 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 Log 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 auth-keynumber - -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 /deacon/users/stenn/.ntprc - - reading file /deacon/backroom/snaps/ntp-stable/sntp/.ntprc - - examining environment variables named SNTP_* - -.I sntp -implements the Simple Network Time Protocol, and is used -to query an NTP or SNTP server and either -display the time -or -set the local system's time (given suitable privilege). - -It can be -run interactively from the command line or as a -.I cron -job. - -NTP and SNTP are defined by draft-ietf-ntp-ntpv4-proto-13, which -obsoletes RFC 4330 and RFC 1305. - -please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org +sntp is unavailable - no --help @end example @exampleindent 4 diff --git a/sntp/sntp.1 b/sntp/sntp.1 index f2809c101..08b99fe6e 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2010-04-27 "( 4.2.6p2-RC2)" "Programmer's Manual" +.TH SNTP 1 2010-05-11 "( 4.2.6p2-RC3)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed April 27, 2010 at 02:53:20 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 11, 2010 at 03:55:44 AM by AutoGen 5.10 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/sntp/sntp.html b/sntp/sntp.html index a55d0ebf4..4fd4035c0 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. -

This document applies to version 4.2.6p2-RC2 of sntp. +

This document applies to version 4.2.6p2-RC3 of sntp.

The program implements the SNTP protocol as defined by the draft NTPv4 IETF specification. diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 5270c8580..9036ef7c1 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 April 27, 2010 at 02:53:21 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:55:45 AM by AutoGen 5.10 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -738,7 +738,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p2-RC2\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p2-RC3\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 3231e36c1..5eeca9bd7 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 April 27, 2010 at 02:53:21 AM by AutoGen 5.10 + * It has been AutoGen-ed May 11, 2010 at 03:55:45 AM by AutoGen 5.10 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -78,8 +78,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 23 -#define NTP_KEYGEN_VERSION "4.2.6p2-RC2" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p2-RC2" +#define NTP_KEYGEN_VERSION "4.2.6p2-RC3" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p2-RC3" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index 262646992..f58d87f6b 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 April 27, 2010 at 02:53:26 AM by AutoGen 5.10 +# It has been AutoGen-ed May 11, 2010 at 03:55:53 AM by AutoGen 5.10 # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore @@ -51,7 +51,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.6p2-RC2 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p2-RC3 USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -c Str certificate certificate scheme diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index 1de4394c7..108980c0c 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2010-04-27 "(ntp 4.2.6p2-RC2)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2010-05-11 "(ntp 4.2.6p2-RC3)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed April 27, 2010 at 02:53:26 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 11, 2010 at 03:55:53 AM by AutoGen 5.10 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"