From: Harlan Stenn Date: Sat, 11 Sep 2010 10:16:58 +0000 (+0000) Subject: NTP_4_2_7P47 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d442ed2a689b4530fd1a839ee247230d6eab0e84;p=thirdparty%2Fntp.git NTP_4_2_7P47 bk: 4c8b571a9YuBhl1_Vf1a1dznfuxL9Q --- diff --git a/ChangeLog b/ChangeLog index c8f9a77c34..2f79f08728 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p47) 2010/09/11 Released by Harlan Stenn * Documentation updates from Dave Mills. * [Bug 1588] finish configure --disable-autokey implementation. * [Bug 1616] refclock_acts.c: if (pp->leap == 2) is always false. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 9494081d76..7c8816588e 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed September 10, 2010 at 10:09:11 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:14:13 AM by AutoGen 5.10 * From the definitions ntpd-opts.def * and the template file options * @@ -1016,7 +1016,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.7p46\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p47\n\ USAGE: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n"; #define zRcName NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index c73dc7864e..6eec62a935 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed September 10, 2010 at 10:09:10 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:14:13 AM by AutoGen 5.10 * From the definitions ntpd-opts.def * and the template file options * @@ -91,8 +91,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 36 -#define NTPD_VERSION "4.2.7p46" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p46" +#define NTPD_VERSION "4.2.7p47" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p47" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 15e9addf0e..54a3fa0aa3 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpd-opts.texi) # -# It has been AutoGen-ed September 10, 2010 at 10:09:32 AM by AutoGen 5.10 +# It has been AutoGen-ed September 11, 2010 at 10:15:00 AM by AutoGen 5.10 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -64,7 +64,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p46 +ntpd - NTP daemon program - Ver. 4.2.7p47 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 257adfcee3..d4cc2d7841 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2010-09-10 "( 4.2.7p46)" "Programmer's Manual" +.TH NTPD 1 2010-09-11 "( 4.2.7p47)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed September 10, 2010 at 10:09:31 AM by AutoGen 5.10 +.\" It has been AutoGen-ed September 11, 2010 at 10:15: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 5c9b904ed2..fe68eabaee 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed September 10, 2010 at 10:09:41 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:15:05 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.7p46\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p47\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 54f5081891..5ffacec9de 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed September 10, 2010 at 10:09:41 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:15:05 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.7p46" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p46" +#define NTPDC_VERSION "4.2.7p47" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p47" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 9cd8d6e89a..7dbe9c62e9 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpdc-opts.texi) # -# It has been AutoGen-ed September 10, 2010 at 10:09:54 AM by AutoGen 5.10 +# It has been AutoGen-ed September 11, 2010 at 10:15:15 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.7p46 +ntpdc - vendor-specific NTP query program - Ver. 4.2.7p47 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 f2f97f6a1f..e258ffbc49 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2010-09-10 "( 4.2.7p46)" "Programmer's Manual" +.TH NTPDC 1 2010-09-11 "( 4.2.7p47)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed September 10, 2010 at 10:09:53 AM by AutoGen 5.10 +.\" It has been AutoGen-ed September 11, 2010 at 10:15:14 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 f8d24a6505..11aae32ac7 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) * - * It has been AutoGen-ed September 10, 2010 at 10:09:54 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:15:16 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.7p46\n\ +"ntpq - standard NTP query program - Ver. 4.2.7p47\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 6955f1ceae..fc8e9467fd 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * It has been AutoGen-ed September 10, 2010 at 10:09:54 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:15:16 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.7p46" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p46" +#define NTPQ_VERSION "4.2.7p47" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p47" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index dd7e2112e7..47918b1c8e 100644 --- a/ntpq/ntpq-opts.texi +++ b/ntpq/ntpq-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpq-opts.texi) # -# It has been AutoGen-ed September 10, 2010 at 10:10:08 AM by AutoGen 5.10 +# It has been AutoGen-ed September 11, 2010 at 10:15:26 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.7p46 +ntpq - standard NTP query program - Ver. 4.2.7p47 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 73de04798c..65d4d69be4 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2010-09-10 "( 4.2.7p46)" "Programmer's Manual" +.TH NTPQ 1 2010-09-11 "( 4.2.7p47)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed September 10, 2010 at 10:10:08 AM by AutoGen 5.10 +.\" It has been AutoGen-ed September 11, 2010 at 10:15:26 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 b6fce7c2d0..cd22b1acf9 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed September 10, 2010 at 10:10:09 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:15:27 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.7p46\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p47\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index edc66e6d9e..b025f739ee 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed September 10, 2010 at 10:10:09 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:15:27 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.7p46" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p46" +#define NTPSNMPD_VERSION "4.2.7p47" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p47" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index 862247b50d..91fb8c6e56 100644 --- a/ntpsnmpd/ntpsnmpd-opts.texi +++ b/ntpsnmpd/ntpsnmpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.texi) # -# It has been AutoGen-ed September 10, 2010 at 10:10:15 AM by AutoGen 5.10 +# It has been AutoGen-ed September 11, 2010 at 10:15:31 AM by AutoGen 5.10 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -34,7 +34,7 @@ This is the automatically generated usage text for ntpsnmpd: @exampleindent 0 @example -ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p46 +ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p47 USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -n no nofork Do not fork diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index 662568c003..7cfbfbc122 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2010-09-10 "( 4.2.7p46)" "Programmer's Manual" +.TH NTPSNMPD 1 2010-09-11 "( 4.2.7p47)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed September 10, 2010 at 10:10:15 AM by AutoGen 5.10 +.\" It has been AutoGen-ed September 11, 2010 at 10:15:31 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 82a956ec08..4e12554385 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -57,7 +57,7 @@ CLTAG=NTP_4_2_0 # - Numeric values increment # - empty 'increments' to 1 # - NEW 'increments' to empty -point=46 +point=47 ### betapoint is normally modified by script. # ntp-stable Beta number (betapoint) diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 60a993e0e3..b35de61f57 100644 --- a/sntp/sntp-opts.c +++ b/sntp/sntp-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.c) * - * It has been AutoGen-ed September 10, 2010 at 10:11:36 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:16:34 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.7p46\n\ +"sntp - standard SNTP program - Ver. 4.2.7p47\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 a93e0387b3..14cd087698 100644 --- a/sntp/sntp-opts.h +++ b/sntp/sntp-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.h) * - * It has been AutoGen-ed September 10, 2010 at 10:11:36 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:16:34 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.7p46" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p46" +#define SNTP_VERSION "4.2.7p47" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p47" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 000b5deb14..497c75ca8d 100644 --- a/sntp/sntp-opts.texi +++ b/sntp/sntp-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (sntp-opts.texi) # -# It has been AutoGen-ed September 10, 2010 at 10:11:44 AM by AutoGen 5.10 +# It has been AutoGen-ed September 11, 2010 at 10:16:39 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 8dcfd1e2fb..d062c5310d 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2010-09-10 "( 4.2.7p46)" "Programmer's Manual" +.TH SNTP 1 2010-09-11 "( 4.2.7p47)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed September 10, 2010 at 10:11:43 AM by AutoGen 5.10 +.\" It has been AutoGen-ed September 11, 2010 at 10:16:38 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 cd0c394c1e..465ce21bc5 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.7p46 of sntp. +

This document applies to version 4.2.7p47 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 a27eb6a1ca..ddb4c209f6 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c) * - * It has been AutoGen-ed September 10, 2010 at 10:11:44 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:16:39 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.7p46\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p47\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -752,7 +752,7 @@ tSCC zDetail[] = "\n\ If there is no new host key, look for an existing one.\n\ If one is not found, create it.\n"; tSCC zFullVersion[] = NTP_KEYGEN_FULL_VERSION; -/* extracted from /usr/local/share/autogen/optcode.tpl near line 495 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -874,7 +874,7 @@ doOptModulus(tOptions* pOptions, tOptDesc* pOptDesc) pOptDesc->optArg.argInt = val; } #endif /* defined AUTOKEY */ -/* extracted from /usr/local/share/autogen/optmain.tpl near line 109 */ +/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 109 */ #if defined(TEST_NTP_KEYGEN_OPTS) /* TEST MAIN PROCEDURE: */ @@ -889,7 +889,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTP_KEYGEN_OPTS */ -/* extracted from /usr/local/share/autogen/optcode.tpl near line 627 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */ #if ENABLE_NLS #include diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index c46c2ce7d5..00db80555a 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h) * - * It has been AutoGen-ed September 10, 2010 at 10:11:44 AM by AutoGen 5.10 + * It has been AutoGen-ed September 11, 2010 at 10:16:39 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.7p46" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p46" +#define NTP_KEYGEN_VERSION "4.2.7p47" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p47" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -252,7 +252,7 @@ typedef enum { ntp_keygenOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntp_keygenOptions.pUsageProc)( &ntp_keygenOptions, c ) -/* extracted from /usr/local/share/autogen/opthead.tpl near line 409 */ +/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 409 */ /* * * * * * * diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index 77b552baed..186637ebf1 100644 --- a/util/ntp-keygen-opts.texi +++ b/util/ntp-keygen-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.texi) # -# It has been AutoGen-ed September 10, 2010 at 10:11:50 AM by AutoGen 5.10 +# It has been AutoGen-ed September 11, 2010 at 10:16:48 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.7p46 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p47 USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -c Str certificate certificate scheme @@ -107,7 +107,7 @@ This is the ``certificate scheme'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize scheme is one of @@ -157,7 +157,7 @@ This is the ``write iff or gq identity keys'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Write the IFF or GQ client keys to the standard output. This is @@ -172,7 +172,7 @@ This is the ``generate gq parameters and keys'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Generate parameters and keys for the GQ identification scheme, @@ -187,7 +187,7 @@ This is the ``generate rsa host key'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Generate new host keys, obsoleting any that may exist. @@ -201,7 +201,7 @@ This is the ``generate iff parameters'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Generate parameters for the IFF identification scheme, obsoleting @@ -216,7 +216,7 @@ This is the ``set issuer name'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Set the suject name to name. This is used as the subject field @@ -238,7 +238,7 @@ This is the ``modulus'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize The number of bits in the prime modulus. The default is 512. @@ -252,7 +252,7 @@ This is the ``generate pc private certificate'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Generate a private certificate. By default, the program generates @@ -267,7 +267,7 @@ This is the ``output private password'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Encrypt generated files containing private data with the specified @@ -282,7 +282,7 @@ This is the ``input private password'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Set the password for reading files to the specified password. @@ -296,7 +296,7 @@ This is the ``generate sign key (rsa or dsa)'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Generate a new sign key of the designated type, obsoleting any @@ -312,7 +312,7 @@ This is the ``set subject name'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Set the issuer name to name. This is used for the issuer field @@ -327,7 +327,7 @@ This is the ``trusted certificate (tc scheme)'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Generate a trusted certificate. By default, the program generates @@ -342,7 +342,7 @@ This is the ``generate mv parameters'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize Generate parameters and keys for the Mu-Varadharajan (MV) @@ -357,7 +357,7 @@ This is the ``update mv keys'' option. This option has some usage constraints. It: @itemize @bullet @item -must be compiled in by defining @code{OPENSSL} during the compilation. +must be compiled in by defining @code{AUTOKEY} during the compilation. @end itemize This option has no @samp{doc} documentation. diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index 0f0f1db6c8..9a74066878 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2010-09-10 "(ntp 4.2.7p46)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2010-09-11 "(ntp 4.2.7p47)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed September 10, 2010 at 10:11:50 AM by AutoGen 5.10 +.\" It has been AutoGen-ed September 11, 2010 at 10:16:48 AM by AutoGen 5.10 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"