From: Harlan Stenn Date: Thu, 3 Jun 2010 06:24:13 +0000 (-0400) Subject: NTP_4_2_6P2_RC5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f0b80a554a89f689e34a7fa41c65e3a8a2ab0da;p=thirdparty%2Fntp.git NTP_4_2_6P2_RC5 bk: 4c074a8djjPia6EbLuG5BNabY3rbQw --- diff --git a/ChangeLog b/ChangeLog index 8cea590486..7fc1566494 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,5 @@ --- +(4.2.6p2-RC5) 2010/06/03 Released by Harlan Stenn * [Bug 1561] ntpq, ntpdc "passwd" prompts for MD5 password w/SHA1. * [Bug 1565] sntp/crypto.c compile fails on MacOS over vsnprintf(). diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 10f983624a..8f95e1731d 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 May 18, 2010 at 11:59:46 PM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:13:35 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.6p2-RC4\n\ +"ntpd - NTP daemon program - Ver. 4.2.6p2-RC5\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 00faf0bea4..182ddc5d84 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 May 18, 2010 at 11:59:46 PM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:13:34 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.6p2-RC4" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.6p2-RC4" +#define NTPD_VERSION "4.2.6p2-RC5" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.6p2-RC5" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 4358442f57..5c812f7acd 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 May 19, 2010 at 12:00:07 AM by AutoGen 5.10 +# It has been AutoGen-ed June 3, 2010 at 02:14:00 AM by AutoGen 5.10 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -63,7 +63,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.6p2-RC4 +ntpd - NTP daemon program - Ver. 4.2.6p2-RC5 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 c9bc861ff4..6bcf395fc8 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2010-05-19 "( 4.2.6p2-RC4)" "Programmer's Manual" +.TH NTPD 1 2010-06-03 "( 4.2.6p2-RC5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed May 19, 2010 at 12:00:07 AM by AutoGen 5.10 +.\" It has been AutoGen-ed June 3, 2010 at 02:14:00 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 105297aa37..648a9a4486 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 May 19, 2010 at 12:00:12 AM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:14:08 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.6p2-RC4\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.6p2-RC5\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 59fd373023..4e5f17906d 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 May 19, 2010 at 12:00:12 AM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:14:08 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.6p2-RC4" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.6p2-RC4" +#define NTPDC_VERSION "4.2.6p2-RC5" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.6p2-RC5" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index fcdf6b18f7..46220cb22a 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 May 19, 2010 at 12:00:23 AM by AutoGen 5.10 +# It has been AutoGen-ed June 3, 2010 at 02:14:26 AM by AutoGen 5.10 # 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.6p2-RC4 +ntpdc - vendor-specific NTP query program - Ver. 4.2.6p2-RC5 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 211d372544..267bcf5651 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2010-05-19 "( 4.2.6p2-RC4)" "Programmer's Manual" +.TH NTPDC 1 2010-06-03 "( 4.2.6p2-RC5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed May 19, 2010 at 12:00:22 AM by AutoGen 5.10 +.\" It has been AutoGen-ed June 3, 2010 at 02:14:25 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 6d2c977f64..5d4c4749fb 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 May 19, 2010 at 12:00:23 AM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:14:26 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.6p2-RC4\n\ +"ntpq - standard NTP query program - Ver. 4.2.6p2-RC5\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index efaaa38b4e..22a7ab3d0a 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 May 19, 2010 at 12:00:23 AM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:14:26 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.6p2-RC4" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.6p2-RC4" +#define NTPQ_VERSION "4.2.6p2-RC5" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.6p2-RC5" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 892466d1d3..76a56a23ee 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 May 19, 2010 at 12:00:33 AM by AutoGen 5.10 +# It has been AutoGen-ed June 3, 2010 at 02:14:38 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.6p2-RC4 +ntpq - standard NTP query program - Ver. 4.2.6p2-RC5 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 bba440288d..6b2486fada 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2010-05-19 "( 4.2.6p2-RC4)" "Programmer's Manual" +.TH NTPQ 1 2010-06-03 "( 4.2.6p2-RC5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed May 19, 2010 at 12:00:33 AM by AutoGen 5.10 +.\" It has been AutoGen-ed June 3, 2010 at 02:14:37 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 7958fe75ef..fb57b55839 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 May 19, 2010 at 12:00:33 AM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:14:38 AM by AutoGen 5.10 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -256,7 +256,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p2-RC4\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p2-RC5\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 96944b52d2..c80fb37c7e 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 May 19, 2010 at 12:00:33 AM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:14:38 AM by AutoGen 5.10 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -63,8 +63,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 8 -#define NTPSNMPD_VERSION "4.2.6p2-RC4" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p2-RC4" +#define NTPSNMPD_VERSION "4.2.6p2-RC5" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p2-RC5" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index a6787d79a4..792e973c08 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 May 19, 2010 at 12:00:34 AM by AutoGen 5.10 +# It has been AutoGen-ed June 3, 2010 at 02:21:33 AM by AutoGen 5.10 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -34,7 +34,29 @@ 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.6p2-RC5 +USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... + Flg Arg Option-Name Description + -n no nofork Do not fork + -p no syslog Log to syslog() + Str agentxsocket The socket address ntpsnmpd uses to connect to net-snmpd + 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 /deacon/users/stenn/.ntprc + - reading file /deacon/backroom/snaps/ntp-stable/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 177c228c3e..eccbfc7bd5 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2010-05-19 "( 4.2.6p2-RC4)" "Programmer's Manual" +.TH NTPSNMPD 1 2010-06-03 "( 4.2.6p2-RC5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed May 19, 2010 at 12:00:34 AM by AutoGen 5.10 +.\" It has been AutoGen-ed June 3, 2010 at 02:21: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 2aa036e978..ab41100948 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -91,4 +91,4 @@ betapoint=0 # - - prerelease is emptied # else (not in RC) # - rcpoint is empty and unused (for now). -rcpoint=4 +rcpoint=5 diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 5ccbaa9df1..30bcadb007 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 May 19, 2010 at 12:01:39 AM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:23:47 AM by AutoGen 5.10 * From the definitions sntp-opts.def * and the template file options * @@ -474,7 +474,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.6p2-RC4\n\ +"sntp - standard SNTP program - Ver. 4.2.6p2-RC5\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 588a42c9d1..450123de3a 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 May 19, 2010 at 12:01:39 AM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:23:47 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.6p2-RC4" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.6p2-RC4" +#define SNTP_VERSION "4.2.6p2-RC5" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.6p2-RC5" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 49587dc484..989728bf30 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 May 19, 2010 at 12:01:45 AM by AutoGen 5.10 +# It has been AutoGen-ed June 3, 2010 at 02:23:52 AM by AutoGen 5.10 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore diff --git a/sntp/sntp.1 b/sntp/sntp.1 index c846542005..6eafa1d5cb 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2010-05-19 "( 4.2.6p2-RC4)" "Programmer's Manual" +.TH SNTP 1 2010-06-03 "( 4.2.6p2-RC5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed May 19, 2010 at 12:01:45 AM by AutoGen 5.10 +.\" It has been AutoGen-ed June 3, 2010 at 02:23:51 AM by AutoGen 5.10 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/sntp/sntp.html b/sntp/sntp.html index fa097fafe0..5cf7786295 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. -

This document applies to version 4.2.6p2-RC4 of sntp. +

This document applies to version 4.2.6p2-RC5 of sntp.

The program implements the SNTP protocol as defined by the draft NTPv4 IETF specification. diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 7213954649..5c703a97c2 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 May 19, 2010 at 12:01:46 AM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:23:52 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.6p2-RC4\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p2-RC5\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 6c779a4428..039b09e1a4 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 May 19, 2010 at 12:01:46 AM by AutoGen 5.10 + * It has been AutoGen-ed June 3, 2010 at 02:23: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.6p2-RC4" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p2-RC4" +#define NTP_KEYGEN_VERSION "4.2.6p2-RC5" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p2-RC5" /* * 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 19808c945d..99e49caa1d 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 May 19, 2010 at 12:01:52 AM by AutoGen 5.10 +# It has been AutoGen-ed June 3, 2010 at 02:24:02 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.6p2-RC4 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p2-RC5 USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -c Str certificate certificate scheme diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index 887d5d60ab..2489f9755c 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2010-05-19 "(ntp 4.2.6p2-RC4)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2010-06-03 "(ntp 4.2.6p2-RC5)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed May 19, 2010 at 12:01:52 AM by AutoGen 5.10 +.\" It has been AutoGen-ed June 3, 2010 at 02:24:02 AM by AutoGen 5.10 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"