From: Harlan Stenn Date: Mon, 30 Nov 2009 10:29:50 +0000 (-0500) Subject: NTP_4_2_5P250_RC X-Git-Tag: NTP_4_2_5P250_RC^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=260efabff7ad04935f4cf112105422ec5a22c9b7;p=thirdparty%2Fntp.git NTP_4_2_5P250_RC bk: 4b139e9ehAu0D69hMLwdYeN-XwOuBQ --- diff --git a/ChangeLog b/ChangeLog index d315d7b66..e24fe2177 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.5p250-RC) 2009/11/30 Released by Harlan Stenn * sntp documentation updates. * [Bug 761] internal resolver does not seem to honor -4/-6 qualifiers * [Bug 1386] Deferred DNS doesn't work on NetBSD diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index eaa929baa..d10dd2bf2 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 28, 2009 at 05:21:41 AM by AutoGen 5.10 + * It has been AutoGen-ed November 30, 2009 at 05:21:36 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.5p249-RC\n\ +"ntpd - NTP daemon program - Ver. 4.2.5p250-RC\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 9fd9499bf..1b6c085e4 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 28, 2009 at 05:21:40 AM by AutoGen 5.10 + * It has been AutoGen-ed November 30, 2009 at 05:21:35 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.5p249-RC" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p249-RC" +#define NTPD_VERSION "4.2.5p250-RC" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p250-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 09e2fda30..ea6bba462 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 28, 2009 at 05:22:01 AM by AutoGen 5.10 +# It has been AutoGen-ed November 30, 2009 at 05:22:19 AM by AutoGen 5.10 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 85395433a..1b86f78a8 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-11-28 "( 4.2.5p249-RC)" "Programmer's Manual" +.TH NTPD 1 2009-11-30 "( 4.2.5p250-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed November 28, 2009 at 05:21:42 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 30, 2009 at 05:21:37 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 6764cd79d..ac53cdab0 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 28, 2009 at 05:22:45 AM by AutoGen 5.10 + * It has been AutoGen-ed November 30, 2009 at 05:23:20 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.5p249-RC\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p250-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 5109bff42..15a79cbc4 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 28, 2009 at 05:22:44 AM by AutoGen 5.10 + * It has been AutoGen-ed November 30, 2009 at 05:23:19 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.5p249-RC" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p249-RC" +#define NTPDC_VERSION "4.2.5p250-RC" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p250-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 f220fcdda..7c631e358 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 28, 2009 at 05:23:10 AM by AutoGen 5.10 +# It has been AutoGen-ed November 30, 2009 at 05:23:46 AM by AutoGen 5.10 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index dd0cb2a6c..4d3db5759 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-11-28 "( 4.2.5p249-RC)" "Programmer's Manual" +.TH NTPDC 1 2009-11-30 "( 4.2.5p250-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed November 28, 2009 at 05:22:46 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 30, 2009 at 05:23:21 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 8c593d1ab..260eeb34e 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 28, 2009 at 05:23:23 AM by AutoGen 5.10 + * It has been AutoGen-ed November 30, 2009 at 05:23:59 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.5p249-RC\n\ +"ntpq - standard NTP query program - Ver. 4.2.5p250-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index f2d6e68f9..ca789da54 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 28, 2009 at 05:23:22 AM by AutoGen 5.10 + * It has been AutoGen-ed November 30, 2009 at 05:23:59 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.5p249-RC" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p249-RC" +#define NTPQ_VERSION "4.2.5p250-RC" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p250-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 76d1b2a22..f2ad48abe 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 28, 2009 at 05:23:46 AM by AutoGen 5.10 +# It has been AutoGen-ed November 30, 2009 at 05:24:23 AM by AutoGen 5.10 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index f61334b55..55516b19f 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-11-28 "( 4.2.5p249-RC)" "Programmer's Manual" +.TH NTPQ 1 2009-11-30 "( 4.2.5p250-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed November 28, 2009 at 05:23:24 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 30, 2009 at 05:24:00 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 b56c20a6f..4c9f96010 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 28, 2009 at 05:24:08 AM by AutoGen 5.10 + * It has been AutoGen-ed November 30, 2009 at 05:24:47 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.5p249-RC\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p250-RC\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 90e8369ce..50795a222 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 28, 2009 at 05:24:07 AM by AutoGen 5.10 + * It has been AutoGen-ed November 30, 2009 at 05:24:46 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.5p249-RC" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p249-RC" +#define NTPSNMPD_VERSION "4.2.5p250-RC" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p250-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 05ace44ba..503069e80 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 28, 2009 at 05:24:21 AM by AutoGen 5.10 +# It has been AutoGen-ed November 30, 2009 at 05:25:01 AM by AutoGen 5.10 # 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 2425a79e7..5bd23e253 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2009-11-28 "( 4.2.5p249-RC)" "Programmer's Manual" +.TH NTPSNMPD 1 2009-11-30 "( 4.2.5p250-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed November 28, 2009 at 05:24:09 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 30, 2009 at 05:24:47 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 eda8da89d..dfdbe6c38 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=249 +point=250 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index ef242900b..99890646c 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 28, 2009 at 05:27:55 AM by AutoGen 5.10 + * It has been AutoGen-ed November 30, 2009 at 05:28:36 AM by AutoGen 5.10 * From the definitions sntp-opts.def * and the template file options * @@ -120,7 +120,7 @@ static const int * "Must also have options" and "Incompatible options": */ tSCC zFilelogText[] = - "Logging to specified logfile"; + "Log to specified logfile"; tSCC zFilelog_NAME[] = "FILELOG"; tSCC zFilelog_Name[] = "filelog"; static const int @@ -180,7 +180,7 @@ tSCC zTimeout_Name[] = "timeout"; * Authentication option description: */ tSCC zAuthenticationText[] = - "Enable authentication with the key keyno. This option is used as -a keyno"; + "Enable authentication with the key auth-keynumber"; tSCC zAuthentication_NAME[] = "AUTHENTICATION"; tSCC zAuthentication_Name[] = "authentication"; #define AUTHENTICATION_FLAGS (OPTST_DISABLED \ @@ -474,7 +474,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.5p249-RC\n\ +"sntp - standard SNTP program - Ver. 4.2.5p250-RC\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 76ad0637a..8ae1fecc1 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 28, 2009 at 05:27:55 AM by AutoGen 5.10 + * It has been AutoGen-ed November 30, 2009 at 05:28: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.5p249-RC" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p249-RC" +#define SNTP_VERSION "4.2.5p250-RC" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p250-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 e83b1e29b..87bd3ce6c 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 November 28, 2009 at 05:28:05 AM by AutoGen 5.10 +# It has been AutoGen-ed November 30, 2009 at 05:28:42 AM by AutoGen 5.10 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore @@ -130,7 +130,7 @@ When this option is set all logging will be done using syslog. @subsection filelog option (-l) @cindex sntp-filelog -This is the ``logging to specified logfile'' option. +This is the ``log to specified logfile'' option. This option has some usage constraints. It: @itemize @bullet @@ -177,8 +177,8 @@ settod. @cindex sntp-broadcast This is the ``use broadcasts to the address specified for synchronisation'' option. -If specified SNTP will listen for NTP broadcasts to the -specified broadcast address. The default maximum wait time, +If specified SNTP will listen to the specified broadcast address +for NTP broadcasts. The default maximum wait time, 68 seconds, can be modified with -t. @node sntp timeout @@ -193,10 +193,10 @@ of seconds specified before giving up. Default 68 seconds. @subsection authentication option (-a) @cindex sntp-authentication -This is the ``enable authentication with the key keyno. this option is used as -a keyno'' option. -This option enables authentication using the key specified in this option\'s argument. +This is the ``enable authentication with the key auth-keynumber'' option. +This option enables authentication using the key specified in this option's argument. The argument of this option is the keyid, a number specified in the keyfile as this -key\'s identifier. See the keyfile option -k for more details. +key's identifier. See the keyfile option (-k) for more details. @node sntp keyfile @subsection keyfile option (-k) diff --git a/sntp/sntp.1 b/sntp/sntp.1 index ce9ab3c26..9662faf35 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2009-11-28 "( 4.2.5p249-RC)" "Programmer's Manual" +.TH SNTP 1 2009-11-30 "( 4.2.5p250-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed November 28, 2009 at 05:28:06 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 30, 2009 at 05:28:43 AM by AutoGen 5.10 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" @@ -31,9 +31,9 @@ which should become a full RFC any month now. .PP The default is to write the estimated correct local date and time (i.e. not UTC) to the standard output in a format like -.BR "'1996 Oct 15 20:17:25.123 + 4.567 +/- 0.089 secs'" , +.BR "'1996 Oct 15 20:17:25.123 +4.567 +/- 0.089 secs'" , where the -.B "'+ 4.567 +/- 0.089 secs'" +.B "'+4.567 +/- 0.089 secs'" indicates the local clock is 4.567 seconds behind the correct time (so 4.567 seconds must be added to the local clock to get it to be correct), and the time of @@ -41,26 +41,6 @@ and the time of is believed to be correct to within +/- 0.089 seconds. -.SH USAGE -The simplest use of this program is as an unprivileged command to check the -current time and error in the local clock. For example: -.IP -.B sntp ntpserver.somewhere -.PP -With suitable privilege, it can be run as a command or in a -.I cron -job to reset the local clock from a reliable server, like the -.I ntpdate -and -.I rdate -commands. For example: -.IP -.B sntp \-a ntpserver.somewhere -.SH RETURN VALUE -The program returns a zero exit -status for success, and a non-zero one otherwise. -.SH BUGS -Please report bugs to http://bugs.ntp.org . .SH OPTIONS .TP .BR \-4 ", " \--ipv4 @@ -87,7 +67,7 @@ tracing should be written to standard error. Fatal ones always produce a diagnostic. This option should be set when there is a suspected problem with the server, network or the source. .TP -.BR \-K " \fIstring\fP, " \--kod "=" \fIstring\fP +.BR \-K " \fIfile-name\fP, " \--kod "=" \fIfile-name\fP KoD history filename. .sp Modifies the filename to be used to persist the history of KoD @@ -101,8 +81,8 @@ filelog. .sp When this option is set all logging will be done using syslog. .TP -.BR \-l " \fIstring\fP, " \--filelog "=" \fIstring\fP -Logging to specified logfile. +.BR \-l " \fIfile-name\fP, " \--filelog "=" \fIfile-name\fP +Log to specified logfile. This option must not appear in combination with any of the following options: syslog. .sp @@ -123,32 +103,32 @@ settod. .sp .TP -.BR \-b " \fIstring\fP, " \--broadcast "=" \fIstring\fP +.BR \-b " \fIbroadcast-address\fP, " \--broadcast "=" \fIbroadcast-address\fP Use broadcasts to the address specified for synchronisation. .sp -If specified SNTP will listen for NTP broadcasts to the -specified broadcast address. The default maximum wait time, +If specified SNTP will listen to the specified broadcast address +for NTP broadcasts. The default maximum wait time, 68 seconds, can be modified with \-t. .TP -.BR \-t " \fInumber\fP, " \--timeout "=" \fInumber\fP +.BR \-t " \fIseconds\fP, " \--timeout "=" \fIseconds\fP Specify the number of seconds to wait for broadcasts. This option takes an integer number as its argument. -The default \fInumber\fP for this option is: +The default \fIseconds\fP for this option is: .ti +4 68 .sp When waiting for a broadcast packet SNTP will wait the number of seconds specified before giving up. Default 68 seconds. .TP -.BR \-a " \fInumber\fP, " \--authentication "=" \fInumber\fP -Enable authentication with the key keyno. This option is used as \-a keyno. +.BR \-a " \fIauth-keynumber\fP, " \--authentication "=" \fIauth-keynumber\fP +Enable authentication with the key auth-keynumber. This option takes an integer number as its argument. .sp -This option enables authentication using the key specified in this option\\'s argument. +This option enables authentication using the key specified in this option's argument. The argument of this option is the keyid, a number specified in the keyfile as this -key\\'s identifier. See the keyfile option \-k for more details. +key's identifier. See the keyfile option (-k) for more details. .TP -.BR \-k " \fIstring\fP, " \--keyfile "=" \fIstring\fP +.BR \-k " \fIfile-name\fP, " \--keyfile "=" \fIfile-name\fP Specify a keyfile. SNTP will look in this file for the key specified with \-a. .sp This option specifies the keyfile. SNTP will search for the key specified with \-a keyno in this @@ -198,6 +178,26 @@ the configuration files. The \fIhomerc\fP files are "\fI$HOME\fP", and "\fI.\fP". If any of these are directories, then the file \fI.ntprc\fP is searched for within those directories. +.SH USAGE +The simplest use of this program is as an unprivileged command to check the +current time and error in the local clock. For example: +.IP +.B sntp ntpserver.somewhere +.PP +With suitable privilege, it can be run as a command or in a +.I cron +job to reset the local clock from a reliable server, like the +.I ntpdate +and +.I rdate +commands. For example: +.IP +.B sntp \-a ntpserver.somewhere +.SH RETURN VALUE +The program returns a zero exit +status for success, and a non-zero one otherwise. +.SH BUGS +Please report bugs to http://bugs.ntp.org . .SH AUTHOR David L. Mills and/or others .br diff --git a/sntp/sntp.html b/sntp/sntp.html index 14145ea9d..25befe1cd 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -32,13 +32,13 @@ Up: (dir)

Simple Network Time Protocol User Manual

-

This document describes the use of the NTP Project's sntp, a program +

This document describes the use of the NTP Project's sntp program, that can be used to query a Network Time Protocol (NTP) server and 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.5p249-RC of sntp. +

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

The program implements the SNTP protocol as defined by the draft NTPv4 IETF specification. @@ -68,12 +68,12 @@ Up: Top

Description

-

By default, sntp writes the local data and time (i.e., not UTC) to the +

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
+
     1996 Oct 15 20:17:25.123 +4.567 +/- 0.089 secs
 

-  
where the + 4.567 +/- 0.089 secs indicates the time offset and
+  
where the +4.567 +/- 0.089 secs indicates the time offset and
 error bound of the system clock relative to the server clock.
 
 
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 2b254ad91..2f76f7835 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 28, 2009 at 05:28:21 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 30, 2009 at 05:28:53 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.5p249-RC\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p250-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 6475ec090..ef0b6941c 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 28, 2009 at 05:28:20 AM by AutoGen 5.10
+ *  It has been AutoGen-ed  November 30, 2009 at 05:28:52 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.5p249-RC"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p249-RC"
+#define NTP_KEYGEN_VERSION       "4.2.5p250-RC"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p250-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 8b4b31013..5427a1a73 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 28, 2009 at 05:28:36 AM by AutoGen 5.10
+# It has been AutoGen-ed  November 30, 2009 at 05:29:09 AM by AutoGen 5.10
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index 0bd8ab1da..12f8caa56 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2009-11-28 "(ntp 4.2.5p249-RC)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2009-11-30 "(ntp 4.2.5p250-RC)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  November 28, 2009 at 05:28:22 AM by AutoGen 5.10
+.\"  It has been AutoGen-ed  November 30, 2009 at 05:28:55 AM by AutoGen 5.10
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"