From: Harlan Stenn Date: Mon, 14 Sep 2009 11:52:01 +0000 (-0400) Subject: NTP_4_2_5P211 X-Git-Tag: NTP_4_2_5P211^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=250e187a761c3372483e648501852560faa4bdbc;p=thirdparty%2Fntp.git NTP_4_2_5P211 bk: 4aae2e611-eGEyePleHUj7kX-kaEAw --- diff --git a/ChangeLog b/ChangeLog index 8a040b87a..b2f39b471 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.5p211) 2009/09/14 Released by Harlan Stenn * [Bug 663] respect ntpq -c and -p order on command line. * [Bug 1292] more VC6 unsigned __int64 workarounds. * [Bug 1296] Added Support for Trimble Acutime Gold. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index df1bebf03..ca07329d5 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 September 6, 2009 at 07:36:02 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:35:50 AM by AutoGen 5.9.9pre5 * From the definitions ntpd-opts.def * and the template file options * @@ -918,7 +918,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.5p210\n\ +"ntpd - NTP daemon program - Ver. 4.2.5p211\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index efa2059d5..a50435f62 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 September 6, 2009 at 07:36:01 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:35:49 AM by AutoGen 5.9.9pre5 * From the definitions ntpd-opts.def * and the template file options * @@ -89,8 +89,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 34 -#define NTPD_VERSION "4.2.5p210" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p210" +#define NTPD_VERSION "4.2.5p211" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p211" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 81e6607a8..6685d3bf8 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 September 6, 2009 at 07:36:05 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 14, 2009 at 07:35:53 AM by AutoGen 5.9.9pre5 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -62,7 +62,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.5p187 +ntpd - NTP daemon program - Ver. 4.2.5p210 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 d13e54d15..4bcfc9eb9 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-09-06 "( 4.2.5p210)" "Programmer's Manual" +.TH NTPD 1 2009-09-14 "( 4.2.5p211)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed September 6, 2009 at 07:36:04 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 14, 2009 at 07:35:51 AM by AutoGen 5.9.9pre5 .\" 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 f7d837dec..c6a487aa9 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 September 6, 2009 at 07:42:57 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:43:09 AM by AutoGen 5.9.9pre5 * From the definitions ntpdc-opts.def * and the template file options * @@ -460,7 +460,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p210\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p211\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index d5531b076..5779d66f2 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 September 6, 2009 at 07:42:56 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:43:09 AM by AutoGen 5.9.9pre5 * 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.5p210" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p210" +#define NTPDC_VERSION "4.2.5p211" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p211" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 75a8e25fc..e21c7618e 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 September 6, 2009 at 07:42:59 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 14, 2009 at 07:43:11 AM by AutoGen 5.9.9pre5 # 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.5p187 +ntpdc - vendor-specific NTP query program - Ver. 4.2.5p210 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 69689bca9..63c5ac290 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-09-06 "( 4.2.5p210)" "Programmer's Manual" +.TH NTPDC 1 2009-09-14 "( 4.2.5p211)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed September 6, 2009 at 07:42:58 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 14, 2009 at 07:43:11 AM by AutoGen 5.9.9pre5 .\" 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 b0dabec43..3adb06d2a 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 September 6, 2009 at 07:43:29 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:43:41 AM by AutoGen 5.9.9pre5 * From the definitions ntpq-opts.def * and the template file options * @@ -90,7 +90,7 @@ tSCC zCommandText[] = "run a command and exit"; tSCC zCommand_NAME[] = "COMMAND"; tSCC zCommand_Name[] = "command"; -#define COMMAND_FLAGS (OPTST_DISABLED | OPTST_STACKED \ +#define COMMAND_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* @@ -203,7 +203,9 @@ static tOptProc /* * #define map the "normal" callout procs to the test ones... */ +#define COMMAND_OPT_PROC optionStackArg #define SET_DEBUG_LEVEL_OPT_PROC optionStackArg +#define PEERS_OPT_PROC optionStackArg #else /* NOT defined TEST_NTPQ_OPTS */ @@ -211,16 +213,20 @@ static tOptProc * When not under test, there are different procs to use */ extern tOptProc - optionPagedUsage, optionPrintVersion, optionStackArg; + ntpq_custom_opt_handler, optionPagedUsage, optionPrintVersion; static tOptProc doUsageOpt; /* * #define map the "normal" callout procs */ +#define COMMAND_OPT_PROC ntpq_custom_opt_handler #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level +#define PEERS_OPT_PROC ntpq_custom_opt_handler +#define COMMAND_OPT_PROC ntpq_custom_opt_handler #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level +#define PEERS_OPT_PROC ntpq_custom_opt_handler #endif /* defined(TEST_NTPQ_OPTS) */ #ifdef TEST_NTPQ_OPTS # define DOVERPROC optionVersionStderr @@ -265,7 +271,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, - /* option proc */ optionStackArg, + /* option proc */ COMMAND_OPT_PROC, /* desc, NAME, name */ zCommandText, zCommand_NAME, zCommand_Name, /* disablement strs */ NULL, NULL }, @@ -301,7 +307,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aPeersCantList, - /* option proc */ NULL, + /* option proc */ PEERS_OPT_PROC, /* desc, NAME, name */ zPeersText, zPeers_NAME, zPeers_Name, /* disablement strs */ NULL, NULL }, @@ -408,7 +414,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.5p210\n\ +"ntpq - standard NTP query program - Ver. 4.2.5p211\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index d993a7622..341bab64d 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 September 6, 2009 at 07:43:28 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:43:41 AM by AutoGen 5.9.9pre5 * 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.5p210" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p210" +#define NTPQ_VERSION "4.2.5p211" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p211" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 8e4ba2f4c..fe73d28f6 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 September 6, 2009 at 07:43:31 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 14, 2009 at 07:43:44 AM by AutoGen 5.9.9pre5 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -46,7 +46,7 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.5p187 +ntpq - standard NTP query program - Ver. 4.2.5p210 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 ad539bc2b..b0d54d50d 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-09-06 "( 4.2.5p210)" "Programmer's Manual" +.TH NTPQ 1 2009-09-14 "( 4.2.5p211)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed September 6, 2009 at 07:43:30 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 14, 2009 at 07:43:43 AM by AutoGen 5.9.9pre5 .\" 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 cf223ad90..de3b53f0a 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 September 6, 2009 at 07:44:15 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:44:30 AM by AutoGen 5.9.9pre5 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -226,7 +226,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p210\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p211\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index df34e76d0..8efbcc6fd 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 September 6, 2009 at 07:44:14 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:44:29 AM by AutoGen 5.9.9pre5 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -62,8 +62,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 7 -#define NTPSNMPD_VERSION "4.2.5p210" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p210" +#define NTPSNMPD_VERSION "4.2.5p211" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p211" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index 91ef56e27..4d974918a 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 September 6, 2009 at 07:44:16 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 14, 2009 at 07:44:32 AM by AutoGen 5.9.9pre5 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index d7af38572..59e678e33 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2009-09-06 "( 4.2.5p210)" "Programmer's Manual" +.TH NTPSNMPD 1 2009-09-14 "( 4.2.5p211)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed September 6, 2009 at 07:44:16 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 14, 2009 at 07:44:31 AM by AutoGen 5.9.9pre5 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index b7406702b..bc8e40422 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -9,7 +9,7 @@ version=${proto}.${major}.${minor} # - Numeric values increment # - empty 'increments' to 1 # - NEW 'increments' to empty -point=210 +point=211 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 694bbf1d3..eaab2cc46 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 September 6, 2009 at 07:49:12 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:49:42 AM by AutoGen 5.9.9pre5 * From the definitions sntp-opts.def * and the template file options * @@ -458,7 +458,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.5p210\n\ +"sntp - standard SNTP program - Ver. 4.2.5p211\n\ USAGE: %s [ - [] | --[{=| }] ]... ...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 75117438a..5e35d0a58 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 September 6, 2009 at 07:49:11 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:49:41 AM by AutoGen 5.9.9pre5 * 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.5p210" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p210" +#define SNTP_VERSION "4.2.5p211" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p211" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 59601a1a6..bb028dbad 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 September 6, 2009 at 07:49:14 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 14, 2009 at 07:49:44 AM by AutoGen 5.9.9pre5 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore @@ -50,7 +50,56 @@ This is the automatically generated usage text for sntp: @exampleindent 0 @example -sntp is unavailable - no --help +sntp - standard SNTP program - Ver. 4.2.5p210 +USAGE: sntp [ - [] | --[@{=| @}] ]... ... + Flg Arg Option-Name Description + -4 no ipv4 Force IPv4 DNS name resolution + -6 no ipv6 Force IPv6 DNS name resolution + - an alternate for 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 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-dev/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/sntp/sntp.1 b/sntp/sntp.1 index bdd1eb4ac..2050fb67d 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2009-09-06 "( 4.2.5p210)" "Programmer's Manual" +.TH SNTP 1 2009-09-14 "( 4.2.5p211)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed September 6, 2009 at 07:49:13 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 14, 2009 at 07:49:43 AM by AutoGen 5.9.9pre5 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index dee745085..39a066662 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 September 6, 2009 at 07:50:17 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:50:48 AM by AutoGen 5.9.9pre5 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -769,7 +769,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p210\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p211\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 34c2871cd..3b7959f70 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 September 6, 2009 at 07:50:16 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed September 14, 2009 at 07:50:48 AM by AutoGen 5.9.9pre5 * 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.5p210" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p210" +#define NTP_KEYGEN_VERSION "4.2.5p211" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p211" /* * 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 c31272f95..c870a26fa 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 September 6, 2009 at 07:50:19 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed September 14, 2009 at 07:50:50 AM by AutoGen 5.9.9pre5 # 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.5p187 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p210 USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -c Str certificate certificate scheme @@ -66,7 +66,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 diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index e54d8a2c6..c5933be28 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-09-06 "(ntp 4.2.5p210)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-09-14 "(ntp 4.2.5p211)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed September 6, 2009 at 07:50:18 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed September 14, 2009 at 07:50:50 AM by AutoGen 5.9.9pre5 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"