From: Harlan Stenn Date: Tue, 17 Nov 2009 12:34:00 +0000 (-0500) Subject: NTP_4_2_5P246_RC X-Git-Tag: NTP_4_2_5P246_RC^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa497058bedba92fd17509e2434a9572314ae089;p=thirdparty%2Fntp.git NTP_4_2_5P246_RC bk: 4b029838dv_Fjt03L7fzrIuhXCZ0EA --- diff --git a/ChangeLog b/ChangeLog index e081a2f1b..a9449221d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.5p246-RC) 2009/11/17 Released by Harlan Stenn * Upgrade to autogen-5.10 * [Bug 1378] Unnecessary resetting of peers during interface update. * [Bug 1382] p245 configure --disable-dependency-tracking won't build. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 58c7e1113..5d3d55338 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed November 14, 2009 at 08:19:42 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:26:39 AM by AutoGen 5.10 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -65,6 +65,7 @@ extern tUsageProc optionUsage; #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 #endif + /* * Ipv4 option description: */ @@ -139,10 +140,9 @@ tSCC zDebug_Level_Name[] = "debug-level"; #define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) #else /* disable Debug_Level */ -#define VALUE_OPT_DEBUG_LEVEL NO_EQUIVALENT #define DEBUG_LEVEL_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zDebug_LevelText NULL #define zDebug_Level_NAME NULL +#define zDebug_LevelText NULL #define zDebug_Level_Name NULL #endif /* DEBUG */ @@ -158,10 +158,9 @@ tSCC zSet_Debug_Level_Name[] = "set-debug-level"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Set_Debug_Level */ -#define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT #define SET_DEBUG_LEVEL_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zSet_Debug_LevelText NULL #define zSet_Debug_Level_NAME NULL +#define zSet_Debug_LevelText NULL #define zSet_Debug_Level_Name NULL #endif /* DEBUG */ @@ -196,10 +195,9 @@ tSCC zJaildir_Name[] = "jaildir"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Jaildir */ -#define VALUE_OPT_JAILDIR NO_EQUIVALENT #define JAILDIR_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zJaildirText NULL #define zJaildir_NAME NULL +#define zJaildirText NULL #define zJaildir_Name NULL #endif /* HAVE_DROPROOT */ @@ -253,10 +251,9 @@ tSCC zModifymmtimer_Name[] = "modifymmtimer"; #define MODIFYMMTIMER_FLAGS (OPTST_DISABLED) #else /* disable Modifymmtimer */ -#define VALUE_OPT_MODIFYMMTIMER NO_EQUIVALENT #define MODIFYMMTIMER_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zModifymmtimerText NULL #define zModifymmtimer_NAME NULL +#define zModifymmtimerText NULL #define zModifymmtimer_Name NULL #endif /* SYS_WINNT */ @@ -329,10 +326,9 @@ tSCC zSaveconfigquit_Name[] = "saveconfigquit"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Saveconfigquit */ -#define VALUE_OPT_SAVECONFIGQUIT NO_EQUIVALENT #define SAVECONFIGQUIT_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zSaveconfigquitText NULL #define zSaveconfigquit_NAME NULL +#define zSaveconfigquitText NULL #define zSaveconfigquit_Name NULL #endif /* SAVECONFIG */ @@ -368,10 +364,9 @@ tSCC zUser_Name[] = "user"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable User */ -#define VALUE_OPT_USER NO_EQUIVALENT #define USER_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zUserText NULL #define zUser_NAME NULL +#define zUserText NULL #define zUser_Name NULL #endif /* HAVE_DROPROOT */ @@ -425,10 +420,9 @@ tSCC zUsepcc_Name[] = "usepcc"; #define USEPCC_FLAGS (OPTST_DISABLED) #else /* disable Usepcc */ -#define VALUE_OPT_USEPCC NO_EQUIVALENT #define USEPCC_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zUsepccText NULL #define zUsepcc_NAME NULL +#define zUsepccText NULL #define zUsepcc_Name NULL #endif /* SYS_WINNT */ @@ -444,20 +438,33 @@ tSCC zPccfreq_Name[] = "pccfreq"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Pccfreq */ -#define VALUE_OPT_PCCFREQ NO_EQUIVALENT #define PCCFREQ_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zPccfreqText NULL #define zPccfreq_NAME NULL +#define zPccfreqText NULL #define zPccfreq_Name NULL #endif /* SYS_WINNT */ /* * Help/More_Help/Version option descriptions: */ -tSCC zHelpText[] = "Display usage information and exit"; +tSCC zHelpText[] = "Display extended usage information and exit"; tSCC zHelp_Name[] = "help"; -tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#ifdef HAVE_WORKING_FORK +#define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) tSCC zMore_Help_Name[] = "more-help"; +tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#else +#define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define zMore_Help_Name NULL +#define zMore_HelpText NULL +#endif +#ifdef NO_OPTIONAL_OPT_ARGS +# define OPTST_VERSION_FLAGS OPTST_IMM | OPTST_NO_INIT +#else +# define OPTST_VERSION_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +#endif + tSCC zVersionText[] = "Output version information and exit"; tSCC zVersion_Name[] = "version"; /* @@ -896,18 +903,11 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zPccfreqText, zPccfreq_NAME, zPccfreq_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 */ VERSION_OPT_FLAGS, 0, + /* opt state flags */ OPTST_VERSION_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -915,7 +915,6 @@ 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, @@ -934,7 +933,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 | OPTST_NO_INIT, 0, + /* opt state flags */ OPTST_MORE_HELP_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -949,7 +948,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.5p245-RC\n\ +"ntpd - NTP daemon program - Ver. 4.2.5p246-RC\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL @@ -958,7 +957,7 @@ tSCC zBugsAddr[] = "http://bugs.ntp.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 501 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -1045,7 +1044,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPD_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 633 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */ #if ENABLE_NLS #include diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 4f46246cf..904e62196 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed November 14, 2009 at 08:19:41 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:26:38 AM by AutoGen 5.10 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -41,7 +41,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 131073 +#define AO_TEMPLATE_VERSION 135168 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -90,8 +90,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 35 -#define NTPD_VERSION "4.2.5p245-RC" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p245-RC" +#define NTPD_VERSION "4.2.5p246-RC" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p246-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -286,6 +286,7 @@ typedef enum { * Interface defines for specific options. */ #define VALUE_OPT_IPV4 '4' + #define WHICH_OPT_IPV4 (DESC(IPV4).optActualValue) #define WHICH_IDX_IPV4 (DESC(IPV4).optActualIndex) #define VALUE_OPT_IPV6 '6' @@ -293,50 +294,36 @@ typedef enum { #define VALUE_OPT_AUTHNOREQ 'A' #define VALUE_OPT_BCASTSYNC 'b' #define VALUE_OPT_CONFIGFILE 'c' -#ifdef DEBUG #define VALUE_OPT_DEBUG_LEVEL 'd' -#endif /* DEBUG */ -#ifdef DEBUG #define VALUE_OPT_SET_DEBUG_LEVEL 'D' -#endif /* DEBUG */ #define VALUE_OPT_DRIFTFILE 'f' #define VALUE_OPT_PANICGATE 'g' -#ifdef HAVE_DROPROOT #define VALUE_OPT_JAILDIR 'i' -#endif /* HAVE_DROPROOT */ #define VALUE_OPT_INTERFACE 'I' #define VALUE_OPT_KEYFILE 'k' #define VALUE_OPT_LOGFILE 'l' #define VALUE_OPT_NOVIRTUALIPS 'L' -#ifdef SYS_WINNT #define VALUE_OPT_MODIFYMMTIMER 'M' -#endif /* SYS_WINNT */ #define VALUE_OPT_NOFORK 'n' #define VALUE_OPT_NICE 'N' #define VALUE_OPT_PIDFILE 'p' #define VALUE_OPT_PRIORITY 'P' + #define OPT_VALUE_PRIORITY (DESC(PRIORITY).optArg.argInt) #define VALUE_OPT_QUIT 'q' #define VALUE_OPT_PROPAGATIONDELAY 'r' -#ifdef SAVECONFIG #define VALUE_OPT_SAVECONFIGQUIT 22 -#endif /* SAVECONFIG */ #define VALUE_OPT_STATSDIR 's' #define VALUE_OPT_TRUSTEDKEY 't' -#ifdef HAVE_DROPROOT #define VALUE_OPT_USER 'u' -#endif /* HAVE_DROPROOT */ #define VALUE_OPT_UPDATEINTERVAL 'U' + #define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt) #define VALUE_OPT_VAR 27 #define VALUE_OPT_DVAR 28 #define VALUE_OPT_SLEW 'x' -#ifdef SYS_WINNT #define VALUE_OPT_USEPCC 30 -#endif /* SYS_WINNT */ -#ifdef SYS_WINNT #define VALUE_OPT_PCCFREQ 31 -#endif /* SYS_WINNT */ #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' #define VALUE_OPT_VERSION INDEX_OPT_VERSION diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 8a54943d4..a19eb1cb1 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 14, 2009 at 08:19:45 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed November 17, 2009 at 07:26:41 AM by AutoGen 5.10 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index d5aae619d..98cd70a95 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2009-11-14 "( 4.2.5p245-RC)" "Programmer's Manual" +.TH NTPD 1 2009-11-17 "( 4.2.5p246-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed November 14, 2009 at 08:19:44 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed November 17, 2009 at 07:26:40 AM by AutoGen 5.10 .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" @@ -296,7 +296,7 @@ The CPU counter (RDTSC on x86) is used unconditionally with the given frequency (in Hz). .TP .BR \-? , " \--help" -Display usage information and exit. +Display extended usage information and exit. .TP .BR \-! , " \--more-help" Extended usage information passed thru pager. diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index e7a9d53f3..36b7a901c 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed November 14, 2009 at 08:21:26 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:27:38 AM by AutoGen 5.10 * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -65,6 +65,7 @@ extern tUsageProc optionUsage; #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 #endif + /* * Ipv4 option description: */ @@ -179,10 +180,24 @@ tSCC zNumeric_Name[] = "numeric"; /* * Help/More_Help/Version option descriptions: */ -tSCC zHelpText[] = "Display usage information and exit"; +tSCC zHelpText[] = "Display extended usage information and exit"; tSCC zHelp_Name[] = "help"; -tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#ifdef HAVE_WORKING_FORK +#define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) tSCC zMore_Help_Name[] = "more-help"; +tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#else +#define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define zMore_Help_Name NULL +#define zMore_HelpText NULL +#endif +#ifdef NO_OPTIONAL_OPT_ARGS +# define OPTST_VERSION_FLAGS OPTST_IMM | OPTST_NO_INIT +#else +# define OPTST_VERSION_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +#endif + tSCC zVersionText[] = "Output version information and exit"; tSCC zVersion_Name[] = "version"; tSCC zSave_OptsText[] = "Save the option state to a config file"; @@ -358,18 +373,11 @@ 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 */ VERSION_OPT_FLAGS, 0, + /* opt state flags */ OPTST_VERSION_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -377,7 +385,6 @@ 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, @@ -396,7 +403,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 | OPTST_NO_INIT, 0, + /* opt state flags */ OPTST_MORE_HELP_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -437,7 +444,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p245-RC\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p246-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -465,7 +472,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 501 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -549,7 +556,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPDC_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 633 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */ #if ENABLE_NLS #include diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index fb0ea0e16..7509296a2 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed November 14, 2009 at 08:21:26 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:27:38 AM by AutoGen 5.10 * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -41,7 +41,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 131073 +#define AO_TEMPLATE_VERSION 135168 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -70,8 +70,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.5p245-RC" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p245-RC" +#define NTPDC_VERSION "4.2.5p246-RC" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p246-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -156,6 +156,7 @@ typedef enum { * Interface defines for specific options. */ #define VALUE_OPT_IPV4 '4' + #define WHICH_OPT_IPV4 (DESC(IPV4).optActualValue) #define WHICH_IDX_IPV4 (DESC(IPV4).optActualIndex) #define VALUE_OPT_IPV6 '6' diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 65b9c017d..94b028666 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 14, 2009 at 08:21:28 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed November 17, 2009 at 07:27:40 AM by AutoGen 5.10 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index c0fdd9fba..cc27bc8b1 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2009-11-14 "( 4.2.5p245-RC)" "Programmer's Manual" +.TH NTPDC 1 2009-11-17 "( 4.2.5p246-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed November 14, 2009 at 08:21:27 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed November 17, 2009 at 07:27:39 AM by AutoGen 5.10 .\" From the definitions ntpdc-opts.def .\" and the template file agman1.tpl .\" @@ -110,7 +110,7 @@ Output all host addresses in dotted-quad numeric format rather than converting to the canonical host names. .TP .BR \-? , " \--help" -Display usage information and exit. +Display extended usage information and exit. .TP .BR \-! , " \--more-help" Extended usage information passed thru pager. diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c index e2b1243b6..a21ab62b2 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) * - * It has been AutoGen-ed November 14, 2009 at 08:22:00 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:28:04 AM by AutoGen 5.10 * From the definitions ntpq-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -65,6 +65,7 @@ extern tUsageProc optionUsage; #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 #endif + /* * Ipv4 option description with * "Must also have options" and "Incompatible options": @@ -168,10 +169,24 @@ tSCC zOld_Rv_Name[] = "old-rv"; /* * Help/More_Help/Version option descriptions: */ -tSCC zHelpText[] = "Display usage information and exit"; +tSCC zHelpText[] = "Display extended usage information and exit"; tSCC zHelp_Name[] = "help"; -tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#ifdef HAVE_WORKING_FORK +#define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) tSCC zMore_Help_Name[] = "more-help"; +tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#else +#define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define zMore_Help_Name NULL +#define zMore_HelpText NULL +#endif +#ifdef NO_OPTIONAL_OPT_ARGS +# define OPTST_VERSION_FLAGS OPTST_IMM | OPTST_NO_INIT +#else +# define OPTST_VERSION_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +#endif + tSCC zVersionText[] = "Output version information and exit"; tSCC zVersion_Name[] = "version"; tSCC zSave_OptsText[] = "Save the option state to a config file"; @@ -341,18 +356,11 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zOld_RvText, zOld_Rv_NAME, zOld_Rv_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 */ VERSION_OPT_FLAGS, 0, + /* opt state flags */ OPTST_VERSION_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -360,7 +368,6 @@ 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, @@ -379,7 +386,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 | OPTST_NO_INIT, 0, + /* opt state flags */ OPTST_MORE_HELP_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -420,7 +427,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.5p245-RC\n\ +"ntpq - standard NTP query program - Ver. 4.2.5p246-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -440,7 +447,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 501 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -524,7 +531,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPQ_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 633 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */ #if ENABLE_NLS #include diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 3046623fd..5bf78da71 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * It has been AutoGen-ed November 14, 2009 at 08:22:00 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:28:03 AM by AutoGen 5.10 * From the definitions ntpq-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -41,7 +41,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 131073 +#define AO_TEMPLATE_VERSION 135168 #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 14 -#define NTPQ_VERSION "4.2.5p245-RC" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p245-RC" +#define NTPQ_VERSION "4.2.5p246-RC" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p246-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 d6cb906da..9679cd91b 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 14, 2009 at 08:22:03 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed November 17, 2009 at 07:28:05 AM by AutoGen 5.10 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index 6b47f0d34..9e291baa0 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2009-11-14 "( 4.2.5p245-RC)" "Programmer's Manual" +.TH NTPQ 1 2009-11-17 "( 4.2.5p246-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed November 14, 2009 at 08:22:02 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed November 17, 2009 at 07:28:05 AM by AutoGen 5.10 .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" @@ -350,7 +350,7 @@ preset this option in a script will enable both older and newer ntpq to behave identically in this regard. .TP .BR \-? , " \--help" -Display usage information and exit. +Display extended usage information and exit. .TP .BR \-! , " \--more-help" Extended usage information passed thru pager. diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c index 086a50082..784f14495 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed November 14, 2009 at 08:22:32 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:28:27 AM by AutoGen 5.10 * From the definitions ntpsnmpd-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -56,6 +56,7 @@ extern tUsageProc optionUsage; #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 #endif + /* * Nofork option description: */ @@ -77,10 +78,24 @@ tSCC zSyslog_Name[] = "syslog"; /* * Help/More_Help/Version option descriptions: */ -tSCC zHelpText[] = "Display usage information and exit"; +tSCC zHelpText[] = "Display extended usage information and exit"; tSCC zHelp_Name[] = "help"; -tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#ifdef HAVE_WORKING_FORK +#define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) tSCC zMore_Help_Name[] = "more-help"; +tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#else +#define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define zMore_Help_Name NULL +#define zMore_HelpText NULL +#endif +#ifdef NO_OPTIONAL_OPT_ARGS +# define OPTST_VERSION_FLAGS OPTST_IMM | OPTST_NO_INIT +#else +# define OPTST_VERSION_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +#endif + tSCC zVersionText[] = "Output version information and exit"; tSCC zVersion_Name[] = "version"; tSCC zSave_OptsText[] = "Save the option state to a config file"; @@ -147,18 +162,11 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zSyslogText, zSyslog_NAME, zSyslog_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 */ VERSION_OPT_FLAGS, 0, + /* opt state flags */ OPTST_VERSION_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -166,7 +174,6 @@ 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, @@ -185,7 +192,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 | OPTST_NO_INIT, 0, + /* opt state flags */ OPTST_MORE_HELP_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -226,7 +233,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p245-RC\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p246-RC\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -238,7 +245,7 @@ tSCC zBugsAddr[] = "http://bugs.ntp.org, bugs@ntp.org"; #define zExplain NULL #define zDetail NULL tSCC zFullVersion[] = NTPSNMPD_FULL_VERSION; -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 501 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -309,7 +316,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPSNMPD_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 633 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */ #if ENABLE_NLS #include diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index f9e583a57..c22aac1b0 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed November 14, 2009 at 08:22:31 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:28:27 AM by AutoGen 5.10 * From the definitions ntpsnmpd-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -41,7 +41,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 131073 +#define AO_TEMPLATE_VERSION 135168 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -62,8 +62,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 7 -#define NTPSNMPD_VERSION "4.2.5p245-RC" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p245-RC" +#define NTPSNMPD_VERSION "4.2.5p246-RC" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p246-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 659990844..914943f85 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 14, 2009 at 08:22:34 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed November 17, 2009 at 07:28:29 AM by AutoGen 5.10 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index b8391ac7e..70312f5f7 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2009-11-14 "( 4.2.5p245-RC)" "Programmer's Manual" +.TH NTPSNMPD 1 2009-11-17 "( 4.2.5p246-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed November 14, 2009 at 08:22:33 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed November 17, 2009 at 07:28:28 AM by AutoGen 5.10 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" @@ -29,7 +29,7 @@ Log to syslog(). .TP .BR \-? , " \--help" -Display usage information and exit. +Display extended usage information and exit. .TP .BR \-! , " \--more-help" Extended usage information passed thru pager. diff --git a/packageinfo.sh b/packageinfo.sh index 5afedc1b8..22ab56ff5 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=245 +point=246 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index ed1c382cd..6223a782d 100644 --- a/sntp/sntp-opts.c +++ b/sntp/sntp-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.c) * - * It has been AutoGen-ed November 14, 2009 at 08:27:39 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:33:00 AM by AutoGen 5.10 * From the definitions sntp-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -56,6 +56,7 @@ extern tUsageProc optionUsage; #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 #endif + /* * Ipv4 option description: */ @@ -189,10 +190,24 @@ tSCC zKeyfile_Name[] = "keyfile"; /* * Help/More_Help/Version option descriptions: */ -tSCC zHelpText[] = "Display usage information and exit"; +tSCC zHelpText[] = "Display extended usage information and exit"; tSCC zHelp_Name[] = "help"; -tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#ifdef HAVE_WORKING_FORK +#define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) tSCC zMore_Help_Name[] = "more-help"; +tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#else +#define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define zMore_Help_Name NULL +#define zMore_HelpText NULL +#endif +#ifdef NO_OPTIONAL_OPT_ARGS +# define OPTST_VERSION_FLAGS OPTST_IMM | OPTST_NO_INIT +#else +# define OPTST_VERSION_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +#endif + tSCC zVersionText[] = "Output version information and exit"; tSCC zVersion_Name[] = "version"; tSCC zSave_OptsText[] = "Save the option state to a config file"; @@ -379,18 +394,11 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zKeyfileText, zKeyfile_NAME, zKeyfile_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 */ VERSION_OPT_FLAGS, 0, + /* opt state flags */ OPTST_VERSION_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -398,7 +406,6 @@ 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, @@ -417,7 +424,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 | OPTST_NO_INIT, 0, + /* opt state flags */ OPTST_MORE_HELP_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -458,7 +465,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.5p245-RC\n\ +"sntp - standard SNTP program - Ver. 4.2.5p246-RC\n\ USAGE: %s [ - [] | --[{=| }] ]... ...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -478,7 +485,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 501 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -549,7 +556,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_SNTP_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 633 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 627 */ #if ENABLE_NLS #include diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 8562da0a0..01f261191 100644 --- a/sntp/sntp-opts.h +++ b/sntp/sntp-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.h) * - * It has been AutoGen-ed November 14, 2009 at 08:27:38 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:33:00 AM by AutoGen 5.10 * From the definitions sntp-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -41,7 +41,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 131073 +#define AO_TEMPLATE_VERSION 135168 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -72,8 +72,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 17 -#define SNTP_VERSION "4.2.5p245-RC" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p245-RC" +#define SNTP_VERSION "4.2.5p246-RC" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p246-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -168,6 +168,7 @@ typedef enum { * Interface defines for specific options. */ #define VALUE_OPT_IPV4 '4' + #define WHICH_OPT_IPV4 (DESC(IPV4).optActualValue) #define WHICH_IDX_IPV4 (DESC(IPV4).optActualIndex) #define VALUE_OPT_IPV6 '6' @@ -179,8 +180,10 @@ typedef enum { #define VALUE_OPT_ADJTIME 'j' #define VALUE_OPT_BROADCAST 'b' #define VALUE_OPT_TIMEOUT 't' + #define OPT_VALUE_TIMEOUT (DESC(TIMEOUT).optArg.argInt) #define VALUE_OPT_AUTHENTICATION 'a' + #define OPT_VALUE_AUTHENTICATION (DESC(AUTHENTICATION).optArg.argInt) #define VALUE_OPT_KEYFILE 'k' #define VALUE_OPT_HELP '?' diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 13efc65c6..be64e9071 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 14, 2009 at 08:27:41 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed November 17, 2009 at 07:33:02 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 795e56751..fa0b018d7 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2009-11-14 "( 4.2.5p245-RC)" "Programmer's Manual" +.TH SNTP 1 2009-11-17 "( 4.2.5p246-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed November 14, 2009 at 08:27:40 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed November 17, 2009 at 07:33:01 AM by AutoGen 5.10 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" @@ -252,7 +252,7 @@ M Key in a 1-to-8 character ASCII string using the MD5 authentication scheme. See more information see ntp.keys(5). .TP .BR \-? , " \--help" -Display usage information and exit. +Display extended usage information and exit. .TP .BR \-! , " \--more-help" Extended usage information passed thru pager. diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 81997a47a..62f19ec81 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c) * - * It has been AutoGen-ed November 14, 2009 at 08:28:03 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:33:15 AM by AutoGen 5.10 * From the definitions ntp-keygen-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -67,6 +67,7 @@ extern tUsageProc optionUsage; #ifndef EXIT_FAILURE # define EXIT_FAILURE 1 #endif + /* * Certificate option description: */ @@ -79,10 +80,9 @@ tSCC zCertificate_Name[] = "certificate"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Certificate */ -#define VALUE_OPT_CERTIFICATE NO_EQUIVALENT #define CERTIFICATE_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zCertificateText NULL #define zCertificate_NAME NULL +#define zCertificateText NULL #define zCertificate_Name NULL #endif /* OPENSSL */ @@ -116,10 +116,9 @@ tSCC zId_Key_Name[] = "id-key"; #define ID_KEY_FLAGS (OPTST_DISABLED) #else /* disable Id_Key */ -#define VALUE_OPT_ID_KEY NO_EQUIVALENT #define ID_KEY_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zId_KeyText NULL #define zId_Key_NAME NULL +#define zId_KeyText NULL #define zId_Key_Name NULL #endif /* OPENSSL */ @@ -134,10 +133,9 @@ tSCC zGq_Params_Name[] = "gq-params"; #define GQ_PARAMS_FLAGS (OPTST_DISABLED) #else /* disable Gq_Params */ -#define VALUE_OPT_GQ_PARAMS NO_EQUIVALENT #define GQ_PARAMS_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zGq_ParamsText NULL #define zGq_Params_NAME NULL +#define zGq_ParamsText NULL #define zGq_Params_Name NULL #endif /* OPENSSL */ @@ -152,10 +150,9 @@ tSCC zHost_Key_Name[] = "host-key"; #define HOST_KEY_FLAGS (OPTST_DISABLED) #else /* disable Host_Key */ -#define VALUE_OPT_HOST_KEY NO_EQUIVALENT #define HOST_KEY_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zHost_KeyText NULL #define zHost_Key_NAME NULL +#define zHost_KeyText NULL #define zHost_Key_Name NULL #endif /* OPENSSL */ @@ -170,10 +167,9 @@ tSCC zIffkey_Name[] = "iffkey"; #define IFFKEY_FLAGS (OPTST_DISABLED) #else /* disable Iffkey */ -#define VALUE_OPT_IFFKEY NO_EQUIVALENT #define IFFKEY_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zIffkeyText NULL #define zIffkey_NAME NULL +#define zIffkeyText NULL #define zIffkey_Name NULL #endif /* OPENSSL */ @@ -189,10 +185,9 @@ tSCC zIssuer_Name_Name[] = "issuer-name"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Issuer_Name */ -#define VALUE_OPT_ISSUER_NAME NO_EQUIVALENT #define ISSUER_NAME_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zIssuer_NameText NULL #define zIssuer_Name_NAME NULL +#define zIssuer_NameText NULL #define zIssuer_Name_Name NULL #endif /* OPENSSL */ @@ -217,10 +212,9 @@ tSCC zModulus_Name[] = "modulus"; | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) #else /* disable Modulus */ -#define VALUE_OPT_MODULUS NO_EQUIVALENT #define MODULUS_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zModulusText NULL #define zModulus_NAME NULL +#define zModulusText NULL #define zModulus_Name NULL #endif /* OPENSSL */ @@ -235,10 +229,9 @@ tSCC zPvt_Cert_Name[] = "pvt-cert"; #define PVT_CERT_FLAGS (OPTST_DISABLED) #else /* disable Pvt_Cert */ -#define VALUE_OPT_PVT_CERT NO_EQUIVALENT #define PVT_CERT_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zPvt_CertText NULL #define zPvt_Cert_NAME NULL +#define zPvt_CertText NULL #define zPvt_Cert_Name NULL #endif /* OPENSSL */ @@ -254,10 +247,9 @@ tSCC zPvt_Passwd_Name[] = "pvt-passwd"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Pvt_Passwd */ -#define VALUE_OPT_PVT_PASSWD NO_EQUIVALENT #define PVT_PASSWD_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zPvt_PasswdText NULL #define zPvt_Passwd_NAME NULL +#define zPvt_PasswdText NULL #define zPvt_Passwd_Name NULL #endif /* OPENSSL */ @@ -273,10 +265,9 @@ tSCC zGet_Pvt_Passwd_Name[] = "get-pvt-passwd"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Get_Pvt_Passwd */ -#define VALUE_OPT_GET_PVT_PASSWD NO_EQUIVALENT #define GET_PVT_PASSWD_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zGet_Pvt_PasswdText NULL #define zGet_Pvt_Passwd_NAME NULL +#define zGet_Pvt_PasswdText NULL #define zGet_Pvt_Passwd_Name NULL #endif /* OPENSSL */ @@ -292,10 +283,9 @@ tSCC zSign_Key_Name[] = "sign-key"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Sign_Key */ -#define VALUE_OPT_SIGN_KEY NO_EQUIVALENT #define SIGN_KEY_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zSign_KeyText NULL #define zSign_Key_NAME NULL +#define zSign_KeyText NULL #define zSign_Key_Name NULL #endif /* OPENSSL */ @@ -311,10 +301,9 @@ tSCC zSubject_Name_Name[] = "subject-name"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Subject_Name */ -#define VALUE_OPT_SUBJECT_NAME NO_EQUIVALENT #define SUBJECT_NAME_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zSubject_NameText NULL #define zSubject_Name_NAME NULL +#define zSubject_NameText NULL #define zSubject_Name_Name NULL #endif /* OPENSSL */ @@ -329,10 +318,9 @@ tSCC zTrusted_Cert_Name[] = "trusted-cert"; #define TRUSTED_CERT_FLAGS (OPTST_DISABLED) #else /* disable Trusted_Cert */ -#define VALUE_OPT_TRUSTED_CERT NO_EQUIVALENT #define TRUSTED_CERT_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zTrusted_CertText NULL #define zTrusted_Cert_NAME NULL +#define zTrusted_CertText NULL #define zTrusted_Cert_Name NULL #endif /* OPENSSL */ @@ -348,10 +336,9 @@ tSCC zMv_Params_Name[] = "mv-params"; | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) #else /* disable Mv_Params */ -#define VALUE_OPT_MV_PARAMS NO_EQUIVALENT #define MV_PARAMS_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zMv_ParamsText NULL #define zMv_Params_NAME NULL +#define zMv_ParamsText NULL #define zMv_Params_Name NULL #endif /* OPENSSL */ @@ -367,20 +354,33 @@ tSCC zMv_Keys_Name[] = "mv-keys"; | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) #else /* disable Mv_Keys */ -#define VALUE_OPT_MV_KEYS NO_EQUIVALENT #define MV_KEYS_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zMv_KeysText NULL #define zMv_Keys_NAME NULL +#define zMv_KeysText NULL #define zMv_Keys_Name NULL #endif /* OPENSSL */ /* * Help/More_Help/Version option descriptions: */ -tSCC zHelpText[] = "Display usage information and exit"; +tSCC zHelpText[] = "Display extended usage information and exit"; tSCC zHelp_Name[] = "help"; -tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#ifdef HAVE_WORKING_FORK +#define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) tSCC zMore_Help_Name[] = "more-help"; +tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; +#else +#define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define zMore_Help_Name NULL +#define zMore_HelpText NULL +#endif +#ifdef NO_OPTIONAL_OPT_ARGS +# define OPTST_VERSION_FLAGS OPTST_IMM | OPTST_NO_INIT +#else +# define OPTST_VERSION_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +#endif + tSCC zVersionText[] = "Output version information and exit"; tSCC zVersion_Name[] = "version"; tSCC zSave_OptsText[] = "Save the option state to a config file"; @@ -667,18 +667,11 @@ 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 */ VERSION_OPT_FLAGS, 0, + /* opt state flags */ OPTST_VERSION_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -686,7 +679,6 @@ 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, @@ -705,7 +697,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 | OPTST_NO_INIT, 0, + /* opt state flags */ OPTST_MORE_HELP_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, @@ -746,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.5p245-RC\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p246-RC\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -760,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/gnu/share/autogen/optcode.tpl near line 501 */ +/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 495 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -897,7 +889,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 633 */ +/* 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 11a612941..f3ec9cb0c 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h) * - * It has been AutoGen-ed November 14, 2009 at 08:28:02 AM by AutoGen 5.9.9pre5 + * It has been AutoGen-ed November 17, 2009 at 07:33:14 AM by AutoGen 5.10 * From the definitions ntp-keygen-opts.def * and the template file options * - * Generated from AutoOpts 32:1:7 templates. + * Generated from AutoOpts 33:0:8 templates. */ /* @@ -41,7 +41,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 131073 +#define AO_TEMPLATE_VERSION 135168 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -78,8 +78,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 23 -#define NTP_KEYGEN_VERSION "4.2.5p245-RC" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p245-RC" +#define NTP_KEYGEN_VERSION "4.2.5p246-RC" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p246-RC" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -203,55 +203,34 @@ typedef enum { * * Interface defines for specific options. */ -#ifdef OPENSSL #define VALUE_OPT_CERTIFICATE 'c' -#endif /* OPENSSL */ #define VALUE_OPT_DEBUG_LEVEL 'd' #define VALUE_OPT_SET_DEBUG_LEVEL 'D' -#ifdef OPENSSL #define VALUE_OPT_ID_KEY 'e' -#endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_GQ_PARAMS 'G' -#endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_HOST_KEY 'H' -#endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_IFFKEY 'I' -#endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_ISSUER_NAME 'i' -#endif /* OPENSSL */ #define VALUE_OPT_MD5KEY 'M' -#ifdef OPENSSL #define VALUE_OPT_MODULUS 'm' +#ifdef OPENSSL + #define OPT_VALUE_MODULUS (DESC(MODULUS).optArg.argInt) #endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_PVT_CERT 'P' -#endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_PVT_PASSWD 'p' -#endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_GET_PVT_PASSWD 'q' -#endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_SIGN_KEY 'S' -#endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_SUBJECT_NAME 's' -#endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_TRUSTED_CERT 'T' -#endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_MV_PARAMS 'V' +#ifdef OPENSSL + #define OPT_VALUE_MV_PARAMS (DESC(MV_PARAMS).optArg.argInt) #endif /* OPENSSL */ -#ifdef OPENSSL #define VALUE_OPT_MV_KEYS 'v' +#ifdef OPENSSL + #define OPT_VALUE_MV_KEYS (DESC(MV_KEYS).optArg.argInt) #endif /* OPENSSL */ #define VALUE_OPT_HELP '?' diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index 2e474ffb8..66b03d576 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 14, 2009 at 08:28:05 AM by AutoGen 5.9.9pre5 +# It has been AutoGen-ed November 17, 2009 at 07:33:17 AM by AutoGen 5.10 # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index 88a0be8b6..438f49ae3 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2009-11-14 "(ntp 4.2.5p245-RC)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2009-11-17 "(ntp 4.2.5p246-RC)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed November 14, 2009 at 08:28:04 AM by AutoGen 5.9.9pre5 +.\" It has been AutoGen-ed November 17, 2009 at 07:33:16 AM by AutoGen 5.10 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\" @@ -141,7 +141,7 @@ This option takes an integer number as its argument. This option has not been fully documented. .TP .BR \-? , " \--help" -Display usage information and exit. +Display extended usage information and exit. .TP .BR \-! , " \--more-help" Extended usage information passed thru pager.