From: Harlan Stenn Date: Wed, 29 Dec 2010 08:13:01 +0000 (+0000) Subject: NTP_4_2_7P105 X-Git-Tag: NTP_4_2_7P105^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c8cd1b4a204ff5d6a79fbb42cdee0a8f942fe8cf;p=thirdparty%2Fntp.git NTP_4_2_7P105 bk: 4d1aed8dVuaqEYIxaq3Dl0Ct9aOHAg --- diff --git a/ChangeLog b/ChangeLog index b6a5f5cba..5046253ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p105) 2010/12/29 Released by Harlan Stenn (4.2.7p104) 2010/12/28 Released by Harlan Stenn * from 4.2.6p3: Create and use scripts/check--help when generating .texi files. diff --git a/clockstuff/clktest-opts.c b/clockstuff/clktest-opts.c index ade9d9cad..d1b8305c6 100644 --- a/clockstuff/clktest-opts.c +++ b/clockstuff/clktest-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (clktest-opts.c) * - * It has been AutoGen-ed December 28, 2010 at 04:33:43 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:09:46 AM by AutoGen 5.11.6pre7 * From the definitions clktest-opts.def * and the template file options * @@ -325,7 +325,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[8] = "CLKTEST"; static char const zUsageTitle[129] = -"clktest - test the clock line discipline - Ver. 4.2.7p104\n\ +"clktest - test the clock line discipline - Ver. 4.2.7p105\n\ USAGE: %s [ - [] | --[{=| }] ]... \n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/clockstuff/clktest-opts.h b/clockstuff/clktest-opts.h index 436491871..1b3fd7e52 100644 --- a/clockstuff/clktest-opts.h +++ b/clockstuff/clktest-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (clktest-opts.h) * - * It has been AutoGen-ed December 28, 2010 at 04:33:42 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:09:46 AM by AutoGen 5.11.6pre7 * From the definitions clktest-opts.def * and the template file options * @@ -63,8 +63,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 10 -#define CLKTEST_VERSION "4.2.7p104" -#define CLKTEST_FULL_VERSION "clktest - test the clock line discipline - Ver. 4.2.7p104" +#define CLKTEST_VERSION "4.2.7p105" +#define CLKTEST_FULL_VERSION "clktest - test the clock line discipline - Ver. 4.2.7p105" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index d1224c8bd..ba7e5ff8c 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 December 28, 2010 at 04:21:26 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:08:53 AM by AutoGen 5.11.6pre7 * From the definitions ntpd-opts.def * and the template file options * @@ -1006,7 +1006,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[5] = "NTPD"; static char const zUsageTitle[133] = -"ntpd - NTP daemon program - Ver. 4.2.7p104\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p105\n\ USAGE: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n"; #define zRcName NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 66514da9e..4d4ec7c54 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 December 28, 2010 at 04:21:26 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:08:53 AM by AutoGen 5.11.6pre7 * From the definitions ntpd-opts.def * and the template file options * @@ -89,8 +89,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 36 -#define NTPD_VERSION "4.2.7p104" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p104" +#define NTPD_VERSION "4.2.7p105" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p105" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 1e291349a..6833be217 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 December 28, 2010 at 04:32:10 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed December 29, 2010 at 08:09:12 AM by AutoGen 5.11.6pre7 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -64,7 +64,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p104 +ntpd - NTP daemon program - Ver. 4.2.7p105 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 9c777bbf8..b7712c204 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2010-12-28 "( 4.2.7p104)" "Programmer's Manual" +.TH NTPD 1 2010-12-29 "( 4.2.7p105)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed December 28, 2010 at 04:21:51 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed December 29, 2010 at 08:09:12 AM by AutoGen 5.11.6pre7 .\" 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 dde583799..e0287c18b 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 December 28, 2010 at 04:33:14 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:09:18 AM by AutoGen 5.11.6pre7 * From the definitions ntpdc-opts.def * and the template file options * @@ -451,7 +451,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[6] = "NTPDC"; static char const zUsageTitle[129] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p104\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p105\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 367c59914..bdc9014bf 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 December 28, 2010 at 04:33:14 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:09:18 AM by AutoGen 5.11.6pre7 * From the definitions ntpdc-opts.def * and the template file options * @@ -68,8 +68,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.7p104" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p104" +#define NTPDC_VERSION "4.2.7p105" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p105" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index cae8fdcad..d235e555c 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 December 28, 2010 at 04:33:24 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed December 29, 2010 at 08:09:27 AM by AutoGen 5.11.6pre7 # 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.7p104 +ntpdc - vendor-specific NTP query program - Ver. 4.2.7p105 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 579d1aa80..a24567f8a 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2010-12-28 "( 4.2.7p104)" "Programmer's Manual" +.TH NTPDC 1 2010-12-29 "( 4.2.7p105)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed December 28, 2010 at 04:33:24 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed December 29, 2010 at 08:09:27 AM by AutoGen 5.11.6pre7 .\" 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 35d8da600..d71b7781e 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 December 28, 2010 at 04:33:25 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:09:28 AM by AutoGen 5.11.6pre7 * From the definitions ntpq-opts.def * and the template file options * @@ -428,7 +428,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[5] = "NTPQ"; static char const zUsageTitle[121] = -"ntpq - standard NTP query program - Ver. 4.2.7p104\n\ +"ntpq - standard NTP query program - Ver. 4.2.7p105\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index e791c0d7c..133e65713 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 December 28, 2010 at 04:33:25 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:09:28 AM by AutoGen 5.11.6pre7 * From the definitions ntpq-opts.def * and the template file options * @@ -67,8 +67,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 14 -#define NTPQ_VERSION "4.2.7p104" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p104" +#define NTPQ_VERSION "4.2.7p105" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p105" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 63c8418e9..7e9e7112e 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 December 28, 2010 at 04:33:36 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed December 29, 2010 at 08:09:39 AM by AutoGen 5.11.6pre7 # 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.7p104 +ntpq - standard NTP query program - Ver. 4.2.7p105 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 647a9fb6e..a7293de51 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2010-12-28 "( 4.2.7p104)" "Programmer's Manual" +.TH NTPQ 1 2010-12-29 "( 4.2.7p105)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed December 28, 2010 at 04:33:36 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed December 29, 2010 at 08:09:38 AM by AutoGen 5.11.6pre7 .\" 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 6599a6617..8acf2bc4c 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 December 28, 2010 at 04:33:37 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:09:40 AM by AutoGen 5.11.6pre7 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -255,7 +255,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[9] = "NTPSNMPD"; static char const zUsageTitle[105] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p104\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p105\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 301c38df7..b0ef0031c 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 December 28, 2010 at 04:33:36 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:09:40 AM by AutoGen 5.11.6pre7 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -61,8 +61,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 8 -#define NTPSNMPD_VERSION "4.2.7p104" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p104" +#define NTPSNMPD_VERSION "4.2.7p105" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p105" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index f86411900..d3c46e737 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 December 28, 2010 at 04:33:42 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed December 29, 2010 at 08:09:45 AM by AutoGen 5.11.6pre7 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -34,7 +34,7 @@ This is the automatically generated usage text for ntpsnmpd: @exampleindent 0 @example -ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p104 +ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p105 USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -n no nofork Do not fork diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index 864ab7ec2..7bee6b4e0 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2010-12-28 "( 4.2.7p104)" "Programmer's Manual" +.TH NTPSNMPD 1 2010-12-29 "( 4.2.7p105)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed December 28, 2010 at 04:33:41 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed December 29, 2010 at 08:09:45 AM by AutoGen 5.11.6pre7 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 07c4b9539..d8b802830 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -57,7 +57,7 @@ CLTAG=NTP_4_2_0 # - Numeric values increment # - empty 'increments' to 1 # - NEW 'increments' to empty -point=104 +point=105 ### betapoint is normally modified by script. # ntp-stable Beta number (betapoint) diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 7c92c0b65..971651878 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 December 28, 2010 at 09:09:47 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:08:46 AM by AutoGen 5.11.6pre7 * From the definitions sntp-opts.def * and the template file options * @@ -473,7 +473,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[5] = "SNTP"; static char const zUsageTitle[123] = -"sntp - standard SNTP program - Ver. 4.2.7p104\n\ +"sntp - standard SNTP program - Ver. 4.2.7p105\n\ USAGE: %s [ - [] | --[{=| }] ]... hostname-or-IP ...\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index cbc4a0c45..2cdbfb30c 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 December 28, 2010 at 09:09:47 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:08:46 AM by AutoGen 5.11.6pre7 * From the definitions sntp-opts.def * and the template file options * @@ -70,8 +70,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 17 -#define SNTP_VERSION "4.2.7p104" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p104" +#define SNTP_VERSION "4.2.7p105" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p105" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 4a6ea0426..15de6d4dd 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 December 28, 2010 at 09:09:55 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed December 29, 2010 at 08:08:52 AM by AutoGen 5.11.6pre7 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore @@ -69,7 +69,61 @@ This is the automatically generated usage text for sntp: @exampleindent 0 @example -sntp is unavailable - no --help +sntp - standard SNTP program - Ver. 4.2.7p105 +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 $HOME/.ntprc + - reading file ./.ntprc + - examining environment variables named SNTP_* + +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 cron job. + +NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC +1305. + +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/sntp/sntp.1 b/sntp/sntp.1 index 921c4811c..82db7eae3 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2010-12-28 "( 4.2.7p104)" "Programmer's Manual" +.TH SNTP 1 2010-12-29 "( 4.2.7p105)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed December 28, 2010 at 09:09:55 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed December 29, 2010 at 08:08:52 AM by AutoGen 5.11.6pre7 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/sntp/sntp.html b/sntp/sntp.html index 834291cdc..7887b892e 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.7p104 of sntp. +

This document applies to version 4.2.7p105 of sntp.

The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -139,7 +139,61 @@ Up: sntp Invocation

This is the automatically generated usage text for sntp: -

sntp is unavailable - no --help
+
sntp - standard SNTP program - Ver. 4.2.7p105
+USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... 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 $HOME/.ntprc
+ - reading file ./.ntprc
+ - examining environment variables named SNTP_*
+
+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 cron job.
+
+NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC
+1305.
+
+please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
 


diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 27829d574..8931e2481 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 December 28, 2010 at 04:33:45 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:09:46 AM by AutoGen 5.11.6pre7 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -757,7 +757,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ static char const zPROGNAME[11] = "NTP_KEYGEN"; static char const zUsageTitle[116] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p104\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p105\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; static char const zRcName[7] = ".ntprc"; static char const * const apzHomeList[3] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index de4e0a70c..8286af652 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 December 28, 2010 at 04:33:45 AM by AutoGen 5.11.6pre7 + * It has been AutoGen-ed December 29, 2010 at 08:09:46 AM by AutoGen 5.11.6pre7 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -77,8 +77,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 24 -#define NTP_KEYGEN_VERSION "4.2.7p104" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p104" +#define NTP_KEYGEN_VERSION "4.2.7p105" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p105" /* * 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 758afdc39..6fa219df5 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 December 28, 2010 at 04:33:53 AM by AutoGen 5.11.6pre7 +# It has been AutoGen-ed December 29, 2010 at 08:09:52 AM by AutoGen 5.11.6pre7 # 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 -ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p104 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p105 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 4b0f08a49..0a0f52a92 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2010-12-28 "(ntp 4.2.7p104)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2010-12-29 "(ntp 4.2.7p105)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed December 28, 2010 at 04:33:53 AM by AutoGen 5.11.6pre7 +.\" It has been AutoGen-ed December 29, 2010 at 08:09:52 AM by AutoGen 5.11.6pre7 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"