From: Harlan Stenn Date: Sat, 28 Nov 2009 10:29:18 +0000 (-0500) Subject: NTP_4_2_5P249_RC X-Git-Tag: NTP_4_2_5P249_RC^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d9e21ad0ae5de469209ae02313e2c8785c5797d;p=thirdparty%2Fntp.git NTP_4_2_5P249_RC bk: 4b10fb7eehGKkAEclhxqMspMbZKv4A --- diff --git a/ChangeLog b/ChangeLog index 98ccc1fa7..c378f300e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.5p249-RC) 2009/11/28 Released by Harlan Stenn * [Bug 1400] An empty KOD DB file causes sntp to coredump. * sntp: documentation cleanup. * sntp: clean up some error messages. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index dce431ed4..eaa929baa 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 26, 2009 at 05:30:58 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:21:41 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.5p248-RC\n\ +"ntpd - NTP daemon program - Ver. 4.2.5p249-RC\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 02cd72145..9fd9499bf 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 26, 2009 at 05:30:57 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:21:40 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.5p248-RC" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p248-RC" +#define NTPD_VERSION "4.2.5p249-RC" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p249-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 a21532828..09e2fda30 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 26, 2009 at 05:31:40 AM by AutoGen 5.10 +# It has been AutoGen-ed November 28, 2009 at 05:22:01 AM by AutoGen 5.10 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -63,66 +63,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -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 - - prohibits these options: - ipv4 - -a no authreq Require crypto authentication - - prohibits these options: - authnoreq - -A no authnoreq Do not require crypto authentication - - prohibits these options: - authreq - -b no bcastsync Allow us to sync to broadcast servers - -c Str configfile configuration file name - -d no debug-level Increase output debug message level - - may appear multiple times - -D Str set-debug-level Set the output debug message level - - may appear multiple times - -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 - -l Str logfile path to the log file - -L no novirtualips Do not listen to virtual interfaces - -n no nofork Do not fork - -N no nice Run at high priority - -p Str pidfile path to the PID file - -P Num priority Process priority - -q no quit Set the time and quit - -r Str propagationdelay Broadcast/propagation delay - Str saveconfigquit Save parsed configuration and quit - -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 - Str dvar make ARG an ntp variable (RW|DEF) - - may appear multiple times - -x no slew Slew up to 600 seconds - opt version Output version 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 -or by a single hyphen and the flag character. - -The following option preset mechanisms are supported: - - examining environment variables named NTPD_* - - - -please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org +ntpd is unavailable - no --help @end example @exampleindent 4 diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 434915ea8..85395433a 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-11-26 "( 4.2.5p248-RC)" "Programmer's Manual" +.TH NTPD 1 2009-11-28 "( 4.2.5p249-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed November 26, 2009 at 05:30:59 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 28, 2009 at 05:21:42 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 858151637..6764cd79d 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 26, 2009 at 05:32:19 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:22:45 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.5p248-RC\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p249-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 13d4498d2..5109bff42 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 26, 2009 at 05:32:18 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:22:44 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.5p248-RC" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p248-RC" +#define NTPDC_VERSION "4.2.5p249-RC" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p249-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 abe58fcb9..f220fcdda 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 26, 2009 at 05:32:43 AM by AutoGen 5.10 +# It has been AutoGen-ed November 28, 2009 at 05:23:10 AM by AutoGen 5.10 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -58,71 +58,7 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -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 - - 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 - - prohibits these options: - command - -p no peers Print a list of the peers - - prohibits these options: - command - -s no showpeers Show a list of the peers - - prohibits these options: - command - -i no interactive Force ntpq to operate in interactive mode - - prohibits these options: - command - listpeers - peers - showpeers - -d no debug-level Increase output debug message level - - may appear multiple times - -D Str set-debug-level Set the output debug message level - - may appear multiple times - -n no numeric numeric host addresses - 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/ntpdc/.ntprc - - examining environment variables named NTPDC_* - -The -[= prog-name =] -utility program is used to query an NTP daemon about its -current state and to request changes in that state. -It uses NTP mode 7 control message formats described in the source code. -The program may -be run either in interactive mode or controlled using command line -arguments. -Extensive state and statistics information is available -through the -[= prog-name =] -interface. -In addition, nearly all the -configuration options which can be specified at startup using -ntpd's configuration file may also be specified at run time using -[= prog-name =] . - -please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org +ntpdc is unavailable - no --help @end example @exampleindent 4 diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index 212c8d835..dd0cb2a6c 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-11-26 "( 4.2.5p248-RC)" "Programmer's Manual" +.TH NTPDC 1 2009-11-28 "( 4.2.5p249-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed November 26, 2009 at 05:32:20 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 28, 2009 at 05:22:46 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 607ba47d9..8c593d1ab 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 26, 2009 at 05:32:54 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:23:23 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.5p248-RC\n\ +"ntpq - standard NTP query program - Ver. 4.2.5p249-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 43a3650e2..f2d6e68f9 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 26, 2009 at 05:32:54 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:23:22 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.5p248-RC" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p248-RC" +#define NTPQ_VERSION "4.2.5p249-RC" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p249-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 732652aab..76d1b2a22 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 26, 2009 at 05:33:17 AM by AutoGen 5.10 +# It has been AutoGen-ed November 28, 2009 at 05:23:46 AM by AutoGen 5.10 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -47,56 +47,7 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -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 - - prohibits these options: - ipv6 - -6 no ipv6 Force IPv6 DNS name resolution - - prohibits these options: - ipv4 - -c Str command run a command and exit - - may appear multiple times - -d no debug-level Increase output debug message level - - may appear multiple times - -D Str set-debug-level Set the output debug message level - - may appear multiple times - -p no peers Print a list of the peers - - prohibits these options: - interactive - -i no interactive Force ntpq to operate in interactive mode - - prohibits these options: - command - peers - -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 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/ntpq/.ntprc - - examining environment variables named NTPQ_* - -The -[= prog-name =] -utility program is used to query NTP servers which -implement the standard NTP mode 6 control message formats defined -in Appendix B of the NTPv3 specification RFC1305, requesting -information about current state and/or changes in that state. -The same formats are used in NTPv4, although some of the -variables have changed and new ones added. - -please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org +ntpq is unavailable - no --help @end example @exampleindent 4 diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index 409deae50..f61334b55 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-11-26 "( 4.2.5p248-RC)" "Programmer's Manual" +.TH NTPQ 1 2009-11-28 "( 4.2.5p249-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed November 26, 2009 at 05:32:55 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 28, 2009 at 05:23:24 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 6b587cb14..b56c20a6f 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 26, 2009 at 05:33:32 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:24:08 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.5p248-RC\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p249-RC\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index f7b21928c..90e8369ce 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 26, 2009 at 05:33:31 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:24:07 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.5p248-RC" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p248-RC" +#define NTPSNMPD_VERSION "4.2.5p249-RC" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p249-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 1cf0a7baa..05ace44ba 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 26, 2009 at 05:33:43 AM by AutoGen 5.10 +# It has been AutoGen-ed November 28, 2009 at 05:24:21 AM by AutoGen 5.10 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -33,28 +33,7 @@ This is the automatically generated usage text for ntpsnmpd: @exampleindent 0 @example -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 +ntpsnmpd is unavailable - no --help @end example @exampleindent 4 diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index f6d5e0fcd..2425a79e7 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2009-11-26 "( 4.2.5p248-RC)" "Programmer's Manual" +.TH NTPSNMPD 1 2009-11-28 "( 4.2.5p249-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed November 26, 2009 at 05:33:33 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 28, 2009 at 05:24:09 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 eb8eea92c..eda8da89d 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=248 +point=249 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 9c2d27a11..ef242900b 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 26, 2009 at 05:38:25 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:27:55 AM by AutoGen 5.10 * From the definitions sntp-opts.def * and the template file options * @@ -172,6 +172,7 @@ tSCC zTimeoutText[] = "Specify the number of seconds to wait for broadcasts"; tSCC zTimeout_NAME[] = "TIMEOUT"; tSCC zTimeout_Name[] = "timeout"; +#define zTimeoutDefaultArg ((char const*)68) #define TIMEOUT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -371,7 +372,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ TIMEOUT_FLAGS, 0, - /* last opt argumnt */ { NULL }, + /* last opt argumnt */ { zTimeoutDefaultArg }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionNumericVal, @@ -473,7 +474,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.5p248-RC\n\ +"sntp - standard SNTP program - Ver. 4.2.5p249-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... hostname-or-IP ...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -489,12 +490,12 @@ 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\ +set the local system's time (given suitable privilege).\n\n\ It can be\n\ run interactively from the command line or as a\n\ .I cron\n\ job.\n\n\ -NTP and SNTP are defined by draft-ietf-ntp-ntpv4-proto-11, which\n\ +NTP and SNTP are defined by draft-ietf-ntp-ntpv4-proto-13, 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 1b8284af3..76ad0637a 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 26, 2009 at 05:38:25 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:27:55 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.5p248-RC" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p248-RC" +#define SNTP_VERSION "4.2.5p249-RC" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p249-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 4389e0221..e83b1e29b 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 26, 2009 at 05:38:30 AM by AutoGen 5.10 +# It has been AutoGen-ed November 28, 2009 at 05:28:05 AM by AutoGen 5.10 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore @@ -18,12 +18,13 @@ to query an NTP or SNTP server and either display the time or set the local system's time (given suitable privilege). + It can be run interactively from the command line or as a .I cron job. -NTP and SNTP are defined by draft-ietf-ntp-ntpv4-proto-11, which +NTP and SNTP are defined by draft-ietf-ntp-ntpv4-proto-13, which obsoletes RFC 4330 and RFC 1305. This section was generated by @strong{AutoGen}, @@ -55,59 +56,7 @@ This is the automatically generated usage text for sntp: @exampleindent 0 @example -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 - - 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 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 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/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 +sntp is unavailable - no --help @end example @exampleindent 4 diff --git a/sntp/sntp.1 b/sntp/sntp.1 index 33abdda2e..ce9ab3c26 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2009-11-26 "( 4.2.5p248-RC)" "Programmer's Manual" +.TH SNTP 1 2009-11-28 "( 4.2.5p249-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed November 26, 2009 at 05:38:30 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 28, 2009 at 05:28:06 AM by AutoGen 5.10 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" @@ -22,85 +22,25 @@ 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). -.SS Options -.PP -.I sntp -recognizes the following options: -.TP -.B \-v -indicates that diagnostic messages for non-fatal errors and a limited amount of -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 -.B \-V -requests more and less comprehensible output, mainly for investigating problems -with apparently inconsistent timestamps. This option should be set when the -program fails with a message indicating that is the trouble. -.TP -.B \-W -requests very verbose debugging output, and will interfere with the timing -when writing to the terminal (because of line buffered output from C). Note -that the times produced by this are the corrections needed, and not the error -in the local clock. This option should be set only when debugging the source. -.TP -.B \-r -indicates that the system clock should be reset by -.IR settod . -Naturally, this will work only if the user has enough privilege. -.TP -.B \-a -indicates that the system clock should be reset by -.IR adjtime . -Naturally, this will work only if the user has enough privilege. + +NTP (the Network Time Protocol) and SNTP (the Simple Network Time Protocol) +are defined and described by +draft-ietf-ntp-ntpv4-proto-13, +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'" , where the .B "'+ 4.567 +/- 0.089 secs'" -indicates the estimated error in the time on the local system. -.TP -.BI \-l " lockfile" -sets the name of the lock file to ensure that there is only -one copy of -.I sntp -running at once. The default is installation-dependent, but will usually be -.IR /etc/sntp.pid . -.TP -.BI \-c " count" -sets the maximum number of NTP packets required to -.IR count . -Acceptable values are from 1 to 25 if a NTP host is specified and from 5 to 25 -otherwise, and the default is 5. If the maximum isn't enough, the system needs -a better consistency algorithm than this program uses. -.TP -.B \-4 -force IPv4 DNS resolution. -.TP -.B \-6 -force IPv6 DNS resolution. -.PP -.B address(es) -are the DNS names or IP numbers of hosts to use for the challenge and response -protocol; if no names are given, the program waits for broadcasts. Polling a -server is vastly more reliable than listening to broadcasts. Note that a -single component numeric address is not allowed, to avoid ambiguities. If -more than one name is give, they will be used in a round-robin fashion. -.PP -Constraints: -.IP -.BR delay / count ")," -and -.B count -must be less than half of -.BR delay . -.IP -In update mode, -.B maxerr -must be less than +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 +'1996 Oct 15 20:17:25.123' +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: @@ -193,6 +133,9 @@ specified broadcast address. The default maximum wait time, .BR \-t " \fInumber\fP, " \--timeout "=" \fInumber\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: +.ti +4 + 68 .sp When waiting for a broadcast packet SNTP will wait the number of seconds specified before giving up. Default 68 seconds. diff --git a/sntp/sntp.html b/sntp/sntp.html index acdaf5a90..14145ea9d 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -3,7 +3,9 @@ Sntp User's Manual - + + +

Sntp User's Manual

+


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

Simple Network Time Protocol User Manual

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

This document applies to version 4.2.5p249-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. +

+


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

Usage

The simplest use of this program is as an unprivileged command to @@ -88,14 +93,13 @@ 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 f758fdd8a..2b254ad91 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 26, 2009 at 05:38:43 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:28:21 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.5p248-RC\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p249-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 230421275..6475ec090 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 26, 2009 at 05:38:42 AM by AutoGen 5.10 + * It has been AutoGen-ed November 28, 2009 at 05:28:20 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.5p248-RC" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p248-RC" +#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" /* * 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 d742b7daf..8b4b31013 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 26, 2009 at 05:38:56 AM by AutoGen 5.10 +# It has been AutoGen-ed November 28, 2009 at 05:28:36 AM by AutoGen 5.10 # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore @@ -50,51 +50,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.5p247-RC -USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... - Flg Arg Option-Name Description - -c Str certificate certificate scheme - -d no debug-level Increase output debug message level - - may appear multiple times - -D Str set-debug-level Set the output debug message level - - may appear multiple times - -e no id-key Write IFF or GQ identity keys - -G no gq-params Generate GQ parameters and keys - -H no host-key generate RSA host key - -I no iffkey generate IFF parameters - -i Str issuer-name set issuer name - -M no md5key generate MD5 keys - -m Num modulus modulus - - 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 - -S Str sign-key generate sign key (RSA or DSA) - -s Str subject-name set subject name - -T no trusted-cert trusted certificate (TC scheme) - -V Num mv-params generate MV parameters - -v Num mv-keys update MV keys - 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/util/.ntprc - - examining environment variables named NTP_KEYGEN_* - -If there is no new host key, look for an existing one. -If one is not found, create it. - -please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org +ntp-keygen is unavailable - no --help @end example @exampleindent 4 diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index 1c08bc5c5..0bd8ab1da 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-11-26 "(ntp 4.2.5p248-RC)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-11-28 "(ntp 4.2.5p249-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed November 26, 2009 at 05:38:44 AM by AutoGen 5.10 +.\" It has been AutoGen-ed November 28, 2009 at 05:28:22 AM by AutoGen 5.10 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"