From: Harlan Stenn Date: Sun, 13 May 2007 00:05:36 +0000 (-0400) Subject: NTP_4_2_5P30 X-Git-Tag: NTP_4_2_5P30^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1a72b601b4dbd8398d056c63969218a3fef15047;p=thirdparty%2Fntp.git NTP_4_2_5P30 bk: 46465650uuGTEcTfC0BX5Xe_RVXYiQ --- diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index cd595a198..c17189a1a 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (ntpd-opts.c) * - * It has been AutoGen-ed Wednesday May 9, 2007 at 07:33:56 AM EDT + * It has been AutoGen-ed Saturday May 12, 2007 at 07:56:33 PM EDT * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 28:0:3 templates. + * Generated from AutoOpts 29:0:4 templates. */ /* @@ -783,12 +783,18 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zSlewText, zSlew_NAME, zSlew_Name, /* disablement strs */ NULL, NULL }, +#ifdef NO_OPTIONAL_OPT_ARGS +# define VERSION_OPT_FLAGS OPTST_IMM | OPTST_NO_INIT +#else +# define VERSION_OPT_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +#endif + { /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL | OPTST_IMM, 0, + /* opt state flags */ VERSION_OPT_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -796,11 +802,14 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zVersionText, NULL, zVersion_Name, /* disablement strs */ NULL, NULL }, +#undef VERSION_OPT_FLAGS + + { /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM, 0, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -812,7 +821,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM, 0, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -827,7 +836,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.5p29\n\ +"ntpd - NTP daemon program - Ver. 4.2.5p30\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL @@ -836,7 +845,7 @@ tSCC zBugsAddr[] = "http://bugs.ntp.isc.org, bugs@ntp.org"; #define zExplain NULL tSCC zDetail[] = "\n\n"; tSCC zFullVersion[] = NTPD_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 378 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -873,7 +882,7 @@ tOptions ntpdOptions = { NO_EQUIVALENT /* index of '-#' option */, NO_EQUIVALENT /* index of default opt */ }, - OPTION_CT, 29 /* user option count */ + 32 /* full option count */, 29 /* user option count */ }; /* @@ -922,7 +931,7 @@ main( int argc, char** argv ) return res; } #endif /* defined TEST_NTPD_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 475 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */ #if ENABLE_NLS #include diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 4d380442f..503331197 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (ntpd-opts.h) * - * It has been AutoGen-ed Wednesday May 9, 2007 at 07:33:55 AM EDT + * It has been AutoGen-ed Saturday May 12, 2007 at 07:56:33 PM EDT * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 28:0:3 templates. + * Generated from AutoOpts 29:0:4 templates. */ /* @@ -42,7 +42,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 114688 +#define AO_TEMPLATE_VERSION 118784 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -88,8 +88,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 32 -#define NTPD_VERSION "4.2.5p29" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p29" +#define NTPD_VERSION "4.2.5p30" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p30" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -320,7 +320,7 @@ typedef enum { ntpdOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdOptions.pUsageProc)( &ntpdOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 345 */ +/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ /* * * * * * * diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 16ee5fad9..f76b5746b 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpd-opts.texi) # -# It has been AutoGen-ed Wednesday May 9, 2007 at 07:33:59 AM EDT +# It has been AutoGen-ed Saturday May 12, 2007 at 07:56:36 PM EDT # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -61,7 +61,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.5p28 +ntpd - NTP daemon program - Ver. 4.2.5p29 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 3b3c1711e..b01b8003e 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2007-05-09 "( 4.2.5p29)" "Programmer's Manual" +.TH NTPD 1 2007-05-12 "( 4.2.5p30)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpd.1) .\" -.\" It has been AutoGen-ed Wednesday May 9, 2007 at 07:33:57 AM EDT +.\" It has been AutoGen-ed Saturday May 12, 2007 at 07:56:35 PM EDT .\" 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 f2c9e5575..5fc17ee70 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (ntpdc-opts.c) * - * It has been AutoGen-ed Wednesday May 9, 2007 at 07:40:12 AM EDT + * It has been AutoGen-ed Saturday May 12, 2007 at 08:03:04 PM EDT * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 28:0:3 templates. + * Generated from AutoOpts 29:0:4 templates. */ /* @@ -384,12 +384,18 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zNumericText, zNumeric_NAME, zNumeric_Name, /* disablement strs */ NULL, NULL }, +#ifdef NO_OPTIONAL_OPT_ARGS +# define VERSION_OPT_FLAGS OPTST_IMM | OPTST_NO_INIT +#else +# define VERSION_OPT_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +#endif + { /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL | OPTST_IMM, 0, + /* opt state flags */ VERSION_OPT_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -397,11 +403,14 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zVersionText, NULL, zVersion_Name, /* disablement strs */ NULL, NULL }, +#undef VERSION_OPT_FLAGS + + { /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM, 0, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -413,7 +422,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM, 0, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -426,7 +435,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL, 0, + | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -438,8 +447,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, - /* opt state flags */ OPTST_DISABLE_IMM | \ - OPTST_SET_ARGTYPE(OPARG_TYPE_STRING), 0, + /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) \ + | OPTST_DISABLE_IMM, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -454,7 +463,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p29\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p30\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -482,7 +491,7 @@ configuration options which can be specified at startup using\n\ ntpd's configuration file may also be specified at run time using\n\ [= prog-name =] .\n"; tSCC zFullVersion[] = NTPDC_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 378 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -519,7 +528,7 @@ tOptions ntpdcOptions = { NO_EQUIVALENT /* index of '-#' option */, NO_EQUIVALENT /* index of default opt */ }, - OPTION_CT, 10 /* user option count */ + 15 /* full option count */, 10 /* user option count */ }; /* @@ -568,7 +577,7 @@ main( int argc, char** argv ) return res; } #endif /* defined TEST_NTPDC_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 475 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */ #if ENABLE_NLS #include diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index eac459b51..0c27e03a1 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (ntpdc-opts.h) * - * It has been AutoGen-ed Wednesday May 9, 2007 at 07:40:11 AM EDT + * It has been AutoGen-ed Saturday May 12, 2007 at 08:03:03 PM EDT * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 28:0:3 templates. + * Generated from AutoOpts 29:0:4 templates. */ /* @@ -42,7 +42,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 114688 +#define AO_TEMPLATE_VERSION 118784 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -71,8 +71,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.5p29" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p29" +#define NTPDC_VERSION "4.2.5p30" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p30" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -173,10 +173,10 @@ typedef enum { #define VALUE_OPT_NUMERIC 'n' #define VALUE_OPT_VERSION 'v' -#define VALUE_OPT_SAVE_OPTS '>' -#define VALUE_OPT_LOAD_OPTS '<' #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' +#define VALUE_OPT_SAVE_OPTS '>' +#define VALUE_OPT_LOAD_OPTS '<' #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \ DESC(SAVE_OPTS).fOptState |= OPTST_SET; \ @@ -191,7 +191,7 @@ typedef enum { ntpdcOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdcOptions.pUsageProc)( &ntpdcOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 345 */ +/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ /* * * * * * * diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 4181be163..90c80b371 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpdc-opts.texi) # -# It has been AutoGen-ed Wednesday May 9, 2007 at 07:40:14 AM EDT +# It has been AutoGen-ed Saturday May 12, 2007 at 08:03:06 PM EDT # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -59,7 +59,7 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTP query program - Ver. 4.2.5p28 +ntpdc - vendor-specific NTP query program - Ver. 4.2.5p29 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 cf1f16140..187e82e06 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2007-05-09 "( 4.2.5p29)" "Programmer's Manual" +.TH NTPDC 1 2007-05-12 "( 4.2.5p30)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpdc.1) .\" -.\" It has been AutoGen-ed Wednesday May 9, 2007 at 07:40:13 AM EDT +.\" It has been AutoGen-ed Saturday May 12, 2007 at 08:03:05 PM EDT .\" 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 3d98f36c9..6138b1d2e 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (ntpq-opts.c) * - * It has been AutoGen-ed Wednesday May 9, 2007 at 07:40:42 AM EDT + * It has been AutoGen-ed Saturday May 12, 2007 at 08:03:34 PM EDT * From the definitions ntpq-opts.def * and the template file options * - * Generated from AutoOpts 28:0:3 templates. + * Generated from AutoOpts 29:0:4 templates. */ /* @@ -332,12 +332,18 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zNumericText, zNumeric_NAME, zNumeric_Name, /* disablement strs */ NULL, NULL }, +#ifdef NO_OPTIONAL_OPT_ARGS +# define VERSION_OPT_FLAGS OPTST_IMM | OPTST_NO_INIT +#else +# define VERSION_OPT_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +#endif + { /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL | OPTST_IMM, 0, + /* opt state flags */ VERSION_OPT_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -345,11 +351,14 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zVersionText, NULL, zVersion_Name, /* disablement strs */ NULL, NULL }, +#undef VERSION_OPT_FLAGS + + { /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM, 0, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -361,7 +370,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM, 0, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -374,7 +383,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL, 0, + | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -386,8 +395,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, - /* opt state flags */ OPTST_DISABLE_IMM | \ - OPTST_SET_ARGTYPE(OPARG_TYPE_STRING), 0, + /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) \ + | OPTST_DISABLE_IMM, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -402,7 +411,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.5p29\n\ +"ntpq - standard NTP query program - Ver. 4.2.5p30\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -422,7 +431,7 @@ information about current state and/or changes in that state.\n\ The same formats are used in NTPv4, although some of the\n\ variables have changed and new ones added.\n"; tSCC zFullVersion[] = NTPQ_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 378 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -459,7 +468,7 @@ tOptions ntpqOptions = { NO_EQUIVALENT /* index of '-#' option */, NO_EQUIVALENT /* index of default opt */ }, - OPTION_CT, 8 /* user option count */ + 13 /* full option count */, 8 /* user option count */ }; /* @@ -508,7 +517,7 @@ main( int argc, char** argv ) return res; } #endif /* defined TEST_NTPQ_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 475 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */ #if ENABLE_NLS #include diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 918ab6e83..db2f788e4 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (ntpq-opts.h) * - * It has been AutoGen-ed Wednesday May 9, 2007 at 07:40:42 AM EDT + * It has been AutoGen-ed Saturday May 12, 2007 at 08:03:34 PM EDT * From the definitions ntpq-opts.def * and the template file options * - * Generated from AutoOpts 28:0:3 templates. + * Generated from AutoOpts 29:0:4 templates. */ /* @@ -42,7 +42,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 114688 +#define AO_TEMPLATE_VERSION 118784 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -69,8 +69,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define NTPQ_VERSION "4.2.5p29" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p29" +#define NTPQ_VERSION "4.2.5p30" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p30" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -159,10 +159,10 @@ typedef enum { #define VALUE_OPT_NUMERIC 'n' #define VALUE_OPT_VERSION 'v' -#define VALUE_OPT_SAVE_OPTS '>' -#define VALUE_OPT_LOAD_OPTS '<' #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' +#define VALUE_OPT_SAVE_OPTS '>' +#define VALUE_OPT_LOAD_OPTS '<' #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \ DESC(SAVE_OPTS).fOptState |= OPTST_SET; \ @@ -177,7 +177,7 @@ typedef enum { ntpqOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpqOptions.pUsageProc)( &ntpqOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 345 */ +/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ /* * * * * * * diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 279a0b46f..356bedcd4 100644 --- a/ntpq/ntpq-opts.texi +++ b/ntpq/ntpq-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpq-opts.texi) # -# It has been AutoGen-ed Wednesday May 9, 2007 at 07:40:45 AM EDT +# It has been AutoGen-ed Saturday May 12, 2007 at 08:03:37 PM EDT # 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.5p28 +ntpq - standard NTP query program - Ver. 4.2.5p29 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 7e3928645..7a9c433ce 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2007-05-09 "( 4.2.5p29)" "Programmer's Manual" +.TH NTPQ 1 2007-05-12 "( 4.2.5p30)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpq.1) .\" -.\" It has been AutoGen-ed Wednesday May 9, 2007 at 07:40:43 AM EDT +.\" It has been AutoGen-ed Saturday May 12, 2007 at 08:03:36 PM EDT .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 9d4d45667..c66194831 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=29 +point=30 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 9e3a73992..4216a31db 100644 --- a/sntp/sntp-opts.c +++ b/sntp/sntp-opts.c @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (sntp-opts.c) * - * It has been AutoGen-ed Wednesday May 9, 2007 at 07:41:09 AM EDT + * It has been AutoGen-ed Saturday May 12, 2007 at 08:04:03 PM EDT * From the definitions sntp-opts.def * and the template file options * - * Generated from AutoOpts 28:0:3 templates. + * Generated from AutoOpts 29:0:4 templates. */ /* @@ -435,12 +435,18 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zAdjtimeText, zAdjtime_NAME, zAdjtime_Name, /* disablement strs */ NULL, NULL }, +#ifdef NO_OPTIONAL_OPT_ARGS +# define VERSION_OPT_FLAGS OPTST_IMM | OPTST_NO_INIT +#else +# define VERSION_OPT_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +#endif + { /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL | OPTST_IMM, 0, + /* opt state flags */ VERSION_OPT_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -448,11 +454,14 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zVersionText, NULL, zVersion_Name, /* disablement strs */ NULL, NULL }, +#undef VERSION_OPT_FLAGS + + { /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM, 0, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -464,7 +473,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM, 0, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -477,7 +486,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL, 0, + | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -489,8 +498,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, - /* opt state flags */ OPTST_DISABLE_IMM | \ - OPTST_SET_ARGTYPE(OPARG_TYPE_STRING), 0, + /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) \ + | OPTST_DISABLE_IMM, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -505,7 +514,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.5p29\n\ +"sntp - standard SNTP program - Ver. 4.2.5p30\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -525,7 +534,7 @@ job.\n\ NTP is the Network Time Protocol (RFC 1305) and SNTP is the\n\ Simple Network Time Protocol (RFC 2030, which supersedes RFC 1769).\n"; tSCC zFullVersion[] = SNTP_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 378 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -563,7 +572,7 @@ tOptions sntpOptions = { NO_EQUIVALENT /* index of '-#' option */, NO_EQUIVALENT /* index of default opt */ }, - OPTION_CT, 8 /* user option count */ + 13 /* full option count */, 8 /* user option count */ }; /* @@ -592,7 +601,7 @@ main( int argc, char** argv ) return res; } #endif /* defined TEST_SNTP_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 475 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */ #if ENABLE_NLS #include diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 7bb59b18e..4a726c068 100644 --- a/sntp/sntp-opts.h +++ b/sntp/sntp-opts.h @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (sntp-opts.h) * - * It has been AutoGen-ed Wednesday May 9, 2007 at 07:41:08 AM EDT + * It has been AutoGen-ed Saturday May 12, 2007 at 08:04:03 PM EDT * From the definitions sntp-opts.def * and the template file options * - * Generated from AutoOpts 28:0:3 templates. + * Generated from AutoOpts 29:0:4 templates. */ /* @@ -121,7 +121,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 114688 +#define AO_TEMPLATE_VERSION 118784 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -148,8 +148,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define SNTP_VERSION "4.2.5p29" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p29" +#define SNTP_VERSION "4.2.5p30" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p30" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -234,10 +234,10 @@ typedef enum { #define VALUE_OPT_ADJTIME 'a' #define VALUE_OPT_VERSION 'v' -#define VALUE_OPT_SAVE_OPTS '>' -#define VALUE_OPT_LOAD_OPTS '<' #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' +#define VALUE_OPT_SAVE_OPTS '>' +#define VALUE_OPT_LOAD_OPTS '<' #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \ DESC(SAVE_OPTS).fOptState |= OPTST_SET; \ @@ -252,7 +252,7 @@ typedef enum { sntpOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*sntpOptions.pUsageProc)( &sntpOptions, c ) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 345 */ +/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ /* * * * * * * diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 2a7d8c672..240d507a8 100644 --- a/sntp/sntp-opts.texi +++ b/sntp/sntp-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (sntp-opts.texi) # -# It has been AutoGen-ed Wednesday May 9, 2007 at 07:41:11 AM EDT +# It has been AutoGen-ed Saturday May 12, 2007 at 08:04:06 PM EDT # 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 5e2a47e97..31b7ef048 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2007-05-09 "( 4.2.5p29)" "Programmer's Manual" +.TH SNTP 1 2007-05-12 "( 4.2.5p30)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (sntp.1) .\" -.\" It has been AutoGen-ed Wednesday May 9, 2007 at 07:41:10 AM EDT +.\" It has been AutoGen-ed Saturday May 12, 2007 at 08:04:05 PM EDT .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 2ba95a8f5..e84b4bf3b 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (ntp-keygen-opts.c) * - * It has been AutoGen-ed Wednesday May 9, 2007 at 07:41:19 AM EDT + * It has been AutoGen-ed Saturday May 12, 2007 at 08:04:44 PM EDT * From the definitions ntp-keygen-opts.def * and the template file options * - * Generated from AutoOpts 28:0:3 templates. + * Generated from AutoOpts 29:0:4 templates. */ /* @@ -721,12 +721,18 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zMv_KeysText, zMv_Keys_NAME, zMv_Keys_Name, /* disablement strs */ NULL, NULL }, +#ifdef NO_OPTIONAL_OPT_ARGS +# define VERSION_OPT_FLAGS OPTST_IMM | OPTST_NO_INIT +#else +# define VERSION_OPT_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +#endif + { /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL | OPTST_IMM, 0, + /* opt state flags */ VERSION_OPT_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -734,11 +740,14 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zVersionText, NULL, zVersion_Name, /* disablement strs */ NULL, NULL }, +#undef VERSION_OPT_FLAGS + + { /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM, 0, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -750,7 +759,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_IMM, 0, + /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -763,7 +772,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) - | OPTST_ARG_OPTIONAL, 0, + | OPTST_ARG_OPTIONAL | OPTST_NO_INIT, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -775,8 +784,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, - /* opt state flags */ OPTST_DISABLE_IMM | \ - OPTST_SET_ARGTYPE(OPARG_TYPE_STRING), 0, + /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) \ + | OPTST_DISABLE_IMM, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -791,7 +800,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p29\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p30\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -805,7 +814,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/gnu/share/autogen/optcode.tpl near line 378 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -843,7 +852,7 @@ tOptions ntp_keygenOptions = { NO_EQUIVALENT /* index of '-#' option */, NO_EQUIVALENT /* index of default opt */ }, - OPTION_CT, 19 /* user option count */ + 24 /* full option count */, 19 /* user option count */ }; /* @@ -945,7 +954,7 @@ main( int argc, char** argv ) return res; } #endif /* defined TEST_NTP_KEYGEN_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 475 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 514 */ #if ENABLE_NLS #include diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index a48dd8075..474f5e230 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -2,11 +2,11 @@ * * DO NOT EDIT THIS FILE (ntp-keygen-opts.h) * - * It has been AutoGen-ed Wednesday May 9, 2007 at 07:41:18 AM EDT + * It has been AutoGen-ed Saturday May 12, 2007 at 08:04:44 PM EDT * From the definitions ntp-keygen-opts.def * and the template file options * - * Generated from AutoOpts 28:0:3 templates. + * Generated from AutoOpts 29:0:4 templates. */ /* @@ -42,7 +42,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 114688 +#define AO_TEMPLATE_VERSION 118784 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -80,8 +80,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 24 -#define NTP_KEYGEN_VERSION "4.2.5p29" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p29" +#define NTP_KEYGEN_VERSION "4.2.5p30" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p30" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -269,10 +269,10 @@ typedef enum { #endif /* OPENSSL */ #define VALUE_OPT_VERSION 'v' -#define VALUE_OPT_SAVE_OPTS '>' -#define VALUE_OPT_LOAD_OPTS '<' #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' +#define VALUE_OPT_SAVE_OPTS '>' +#define VALUE_OPT_LOAD_OPTS '<' #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT_MASK; \ DESC(SAVE_OPTS).fOptState |= OPTST_SET; \ @@ -287,7 +287,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/gnu/share/autogen/opthead.tpl near line 345 */ +/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 360 */ /* * * * * * * diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index b5c571087..cac6ef143 100644 --- a/util/ntp-keygen-opts.texi +++ b/util/ntp-keygen-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntp-keygen-opts.texi) # -# It has been AutoGen-ed Wednesday May 9, 2007 at 07:41:20 AM EDT +# It has been AutoGen-ed Saturday May 12, 2007 at 08:04:46 PM EDT # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore @@ -53,7 +53,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.5p28 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p29 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 2ca555373..ca222fc4a 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2007-05-09 "(ntp 4.2.5p29)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2007-05-12 "(ntp 4.2.5p30)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Wednesday May 9, 2007 at 07:41:20 AM EDT +.\" It has been AutoGen-ed Saturday May 12, 2007 at 08:04:45 PM EDT .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"