From: Harlan Stenn Date: Thu, 26 Nov 2009 10:39:41 +0000 (-0500) Subject: NTP_4_2_5P248_RC X-Git-Tag: NTP_4_2_5P248_RC^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=449e19f4db2576920c192b058d76b8da39504180;p=thirdparty%2Fntp.git NTP_4_2_5P248_RC bk: 4b0e5aed7jENlw2_bgi1MrmkBTBhdA --- diff --git a/ChangeLog b/ChangeLog index 56b866bd8..684bd850a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.5p248-RC) 2009/11/26 Released by Harlan Stenn * Prepare for the generation of sntp.html. * Documentation changes from Dave Mills. * [Bug 1387] Storage leak in ntp_intres (minor). diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 0afebc2b1..dce431ed4 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 November 20, 2009 at 05:28:59 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:30:58 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.5p247-RC\n\ +"ntpd - NTP daemon program - Ver. 4.2.5p248-RC\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index f90f75f1b..02cd72145 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 November 20, 2009 at 05:28:58 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:30:57 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.5p247-RC" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p247-RC" +#define NTPD_VERSION "4.2.5p248-RC" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p248-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 629ef4d96..a21532828 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 November 20, 2009 at 05:29:01 AM by AutoGen 5.10 +# It has been AutoGen-ed November 26, 2009 at 05:31:40 AM by AutoGen 5.10 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -63,12 +63,15 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.5p242-RC +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 @@ -84,6 +87,7 @@ USAGE: ntpd [ - [] | --[@{=| @}] ]... -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 @@ -99,6 +103,7 @@ USAGE: ntpd [ - [] | --[@{=| @}] ]... -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 @@ -106,7 +111,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 508ca9222..434915ea8 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-11-20 "( 4.2.5p247-RC)" "Programmer's Manual" +.TH NTPD 1 2009-11-26 "( 4.2.5p248-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed November 20, 2009 at 05:29:00 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 26, 2009 at 05:30:59 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 c99ed51e6..858151637 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 November 20, 2009 at 05:30:16 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:32:19 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.5p247-RC\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p248-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 55f802bfb..13d4498d2 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 November 20, 2009 at 05:30:16 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:32:18 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.5p247-RC" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p247-RC" +#define NTPDC_VERSION "4.2.5p248-RC" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p248-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 9e60ed178..abe58fcb9 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 November 20, 2009 at 05:30:18 AM by AutoGen 5.10 +# It has been AutoGen-ed November 26, 2009 at 05:32:43 AM by AutoGen 5.10 # 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.5p242-RC +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 f049d5933..212c8d835 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-11-20 "( 4.2.5p247-RC)" "Programmer's Manual" +.TH NTPDC 1 2009-11-26 "( 4.2.5p248-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed November 20, 2009 at 05:30:17 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 26, 2009 at 05:32:20 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 c187c61ea..607ba47d9 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 November 20, 2009 at 05:30:41 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:32:54 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.5p247-RC\n\ +"ntpq - standard NTP query program - Ver. 4.2.5p248-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 700b0115e..43a3650e2 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 November 20, 2009 at 05:30:41 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:32:54 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.5p247-RC" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p247-RC" +#define NTPQ_VERSION "4.2.5p248-RC" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p248-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 4457085a4..732652aab 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 November 20, 2009 at 05:30:43 AM by AutoGen 5.10 +# It has been AutoGen-ed November 26, 2009 at 05:33:17 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.5p242-RC +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 @@ -72,7 +72,7 @@ USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] -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 d3ac6d10a..409deae50 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-11-20 "( 4.2.5p247-RC)" "Programmer's Manual" +.TH NTPQ 1 2009-11-26 "( 4.2.5p248-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed November 20, 2009 at 05:30:42 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 26, 2009 at 05:32:55 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 f82a0f0b1..6b587cb14 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 November 20, 2009 at 05:31:04 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:33:32 AM by AutoGen 5.10 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -233,7 +233,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p247-RC\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p248-RC\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 781f1cca3..f7b21928c 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 November 20, 2009 at 05:31:04 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:33:31 AM by AutoGen 5.10 * 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.5p247-RC" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p247-RC" +#define NTPSNMPD_VERSION "4.2.5p248-RC" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p248-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index a57fa2071..1cf0a7baa 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 November 20, 2009 at 05:31:06 AM by AutoGen 5.10 +# It has been AutoGen-ed November 26, 2009 at 05:33:43 AM by AutoGen 5.10 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -33,7 +33,28 @@ This is the automatically generated usage text for ntpsnmpd: @exampleindent 0 @example -ntpsnmpd is unavailable - no --help +ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p247-RC +USAGE: ntpsnmpd [ - | -- ]... + Flg Arg Option-Name Description + -n no nofork Do not fork + -p no syslog Log to syslog() + 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-dev/ntpsnmpd/.ntprc + - examining environment variables named NTPSNMPD_* + +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index cd83bfbe3..f6d5e0fcd 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2009-11-20 "( 4.2.5p247-RC)" "Programmer's Manual" +.TH NTPSNMPD 1 2009-11-26 "( 4.2.5p248-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed November 20, 2009 at 05:31:05 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 26, 2009 at 05:33:33 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 a6a746ce9..eb8eea92c 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=247 +point=248 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index e75b1d896..9c2d27a11 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 November 20, 2009 at 05:35:47 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:38:25 AM by AutoGen 5.10 * From the definitions sntp-opts.def * and the template file options * @@ -473,8 +473,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.5p247-RC\n\ -USAGE: %s [ - [] | --[{=| }] ]... ...\n"; +"sntp - standard SNTP program - Ver. 4.2.5p248-RC\n\ +USAGE: %s [ - [] | --[{=| }] ]... hostname-or-IP ...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { "$HOME", @@ -485,13 +485,17 @@ tSCC zBugsAddr[] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL tSCC zDetail[] = "\n\ .I sntp\n\ -can be used as a SNTP client to query a NTP or SNTP server and either display\n\ -the time or set the local system's time (given suitable privilege). It can be\n\ -run as an interactive command or in a\n\ +implements the Simple Network Time Protocol, and is used\n\ +to query an NTP or SNTP server and either\n\ +display the time\n\ +or\n\ +set the local system's time (given suitable privilege).\n\ +It can be\n\ +run interactively from the command line or as a\n\ .I cron\n\ -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"; +job.\n\n\ +NTP and SNTP are defined by draft-ietf-ntp-ntpv4-proto-11, which\n\ +obsoletes RFC 4330 and RFC 1305.\n"; tSCC zFullVersion[] = SNTP_FULL_VERSION; /* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */ diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index acf080e4d..1b8284af3 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 November 20, 2009 at 05:35:47 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:38:25 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.5p247-RC" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p247-RC" +#define SNTP_VERSION "4.2.5p248-RC" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p248-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 5948049ff..4389e0221 100644 --- a/sntp/sntp-opts.texi +++ b/sntp/sntp-opts.texi @@ -6,20 +6,25 @@ # # EDIT THIS FILE WITH CAUTION (sntp-opts.texi) # -# It has been AutoGen-ed November 20, 2009 at 05:35:49 AM by AutoGen 5.10 +# It has been AutoGen-ed November 26, 2009 at 05:38:30 AM by AutoGen 5.10 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore This program has no explanation. .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 +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 is the Network Time Protocol (RFC 1305) and SNTP is the -Simple Network Time Protocol (RFC 2030, which supersedes RFC 1769). + +NTP and SNTP are defined by draft-ietf-ntp-ntpv4-proto-11, which +obsoletes RFC 4330 and RFC 1305. This section was generated by @strong{AutoGen}, the aginfo template and the option descriptions for the @command{sntp} program. It documents the sntp usage text and option meanings. @@ -50,12 +55,15 @@ This is the automatically generated usage text for sntp: @exampleindent 0 @example -sntp - standard SNTP program - Ver. 4.2.5p242-RC +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 - - an alternate for ipv4 + - prohibits these options: + ipv4 -d no normalverbose Normal verbose -K Str kod KoD history filename -p no syslog Logging with syslog @@ -75,7 +83,7 @@ USAGE: sntp [ - [] | --[@{=| @}] ]... ... -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 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 @@ -258,4 +266,4 @@ N Key in 64 Bit hexadecimal number as specified in the NTP standard. A Key in a 1-to-8 character ASCII string. M Key in a 1-to-8 character ASCII string using the MD5 authentication scheme. -See more information see ntp.keys(5). +For more information see ntp.keys(5). diff --git a/sntp/sntp.1 b/sntp/sntp.1 index e647d9ad3..33abdda2e 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2009-11-20 "( 4.2.5p247-RC)" "Programmer's Manual" +.TH SNTP 1 2009-11-26 "( 4.2.5p248-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed November 20, 2009 at 05:35:48 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 26, 2009 at 05:38:30 AM by AutoGen 5.10 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" @@ -13,7 +13,7 @@ sntp \- standard SNTP program .RB [ \-\fIflag\fP " [\fIvalue\fP]]... [" \--\fIopt-name\fP " [[=| ]\fIvalue\fP]]..." .br .in +8 -... +hostname-or-IP ... .SH "DESCRIPTION" This manual page briefly documents the \fBsntp\fP command. .I sntp @@ -116,42 +116,11 @@ and commands. For example: .IP .B sntp \-a ntpserver.somewhere -.PP -More information on how to use this utility is given in the -.I README -file in the distribution. In particular, this -.I man -page does not describe how to set it up as a server, which needs special care -to avoid propagating misinformation. .SH RETURN VALUE -When used as a client in non-daemon mode, the program returns a zero exit -status for success, and a non-zero one otherwise. When used as a daemon -(either client or server), it does not return except after a serious error. +The program returns a zero exit +status for success, and a non-zero one otherwise. .SH BUGS -The program implements the SNTP protocol, and does not provide all NTP -facilities. In particular, it contains no checks against any form of spoofing. -If this is a serious concern, some network security mechanism (like a firewall -or even just -.IR tcpwrappers ) -should be installed. -.PP -There are some errors, ambiguities and inconsistencies in the RFCs, and this -code may not interwork with all other NTP implementations. Any unreasonable -restrictions should be reported as bugs to whoever is responsible. It may -be difficult to find out who that is. -.PP -The program will stop as soon as it feels that things have got out of control. -In client daemon mode, it will usually fail during an extended period of -network or server inaccessibility or excessively slow performance, or when the -local clock is reset by another process. It will then need restarting -manually. Experienced system administrators can write a shell script, a -.I cron -job or put it in -.IR inittab , -to do this automatically. -.PP -.SH AUTHOR -.I sntp +Please report bugs to http://bugs.ntp.org . .SH OPTIONS .TP .BR \-4 ", " \--ipv4 @@ -251,7 +220,7 @@ N Key in 64 Bit hexadecimal number as specified in the NTP standard. A Key in a 1-to-8 character ASCII string. M Key in a 1-to-8 character ASCII string using the MD5 authentication scheme. -See more information see ntp.keys(5). +For more information see ntp.keys(5). .TP .BR \-? , " \--help" Display extended usage information and exit. diff --git a/sntp/sntp.html b/sntp/sntp.html index dcc7e9d63..acdaf5a90 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -3,9 +3,7 @@ Sntp User's Manual - - - +

Sntp User's Manual

- -Next: , +Node: Top, +Next: , Previous: (dir), Up: (dir) - +

Simple Network Time Protocol User Manual

@@ -38,12 +33,13 @@ 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.5p247-RC of sntp. +

This document applies to version 4.2.5p248-RC of sntp.

The program implements the SNTP protocol as defined by the draft NTPv4 IETF specification. -

+ +

Short Contents

- +Node: sntp Description, Next: , Previous: Top, Up: Top - +
-

Description

By default, sntp writes the local data and time (i.e., not UTC) to the standard output in the format: 

     1996 Oct 15 20:17:25.123 + 4.567 +/- 0.089 secs
-
+ +

where the + 4.567 +/- 0.089 secs indicates the time offset and error bound of the system clock relative to the server clock. -

- -Previous: sntp Description, +Node: Usage, +Previous: sntp Description, Up: Top - +
-

Usage

The simplest use of this program is as an unprivileged command to @@ -93,13 +88,14 @@ check the current time, offset, and error in the local clock. For example: 

     sntp ntpserver.somewhere
-
+ +

With suitable privilege, it can be run as a command or in a crom job to reset the local clock from a reliable server, like the ntpdate and rdate commands. For example: 

     sntp -a ntpserver.somewhere
-
- + + diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index f2304c192..f758fdd8a 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 November 20, 2009 at 05:36:04 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:38:43 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.5p247-RC\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p248-RC\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 1c41af709..230421275 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 November 20, 2009 at 05:36:04 AM by AutoGen 5.10 + * It has been AutoGen-ed November 26, 2009 at 05:38:42 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.5p247-RC" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p247-RC" +#define NTP_KEYGEN_VERSION "4.2.5p248-RC" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p248-RC" /* * 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 217cbce4f..d742b7daf 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 November 20, 2009 at 05:36:06 AM by AutoGen 5.10 +# It has been AutoGen-ed November 26, 2009 at 05:38:56 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.5p242-RC +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 @@ -76,7 +76,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 cee3be9aa..1c08bc5c5 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-11-20 "(ntp 4.2.5p247-RC)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-11-26 "(ntp 4.2.5p248-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed November 20, 2009 at 05:36:05 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 26, 2009 at 05:38:44 AM by AutoGen 5.10 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"