From: Harlan Stenn Date: Fri, 17 Dec 2010 01:22:36 +0000 (-0500) Subject: libopts upgrade X-Git-Tag: NTP_4_2_7P95~3^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7029a8ac8fc84a0c7bf1115b79fb3b9b9a38090e;p=thirdparty%2Fntp.git libopts upgrade bk: 4d0abb5cSs9KOLWTAWxRZoZ_l-9_yw --- diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 86738b9c8..4d238d0e4 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 27, 2010 at 11:50:26 PM by AutoGen 5.11.3 + * It has been AutoGen-ed December 16, 2010 at 07:19:38 PM by AutoGen 5.11.6pre2 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 33:3:8 templates. + * Generated from AutoOpts 33:4:8 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -963,7 +963,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 493 */ +/* extracted from /usr/local/share/autogen/optcode.tpl near line 493 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -1036,7 +1036,7 @@ DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); } #endif /* defined DEBUG */ #endif /* defined(TEST_NTPD_OPTS) */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ +/* extracted from /usr/local/share/autogen/optmain.tpl near line 107 */ #if defined(TEST_NTPD_OPTS) /* TEST MAIN PROCEDURE: */ @@ -1054,7 +1054,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPD_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */ +/* extracted from /usr/local/share/autogen/optcode.tpl near line 626 */ #if ENABLE_NLS #include diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index eec5eb3ee..8067c32ad 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 27, 2010 at 11:50:26 PM by AutoGen 5.11.3 + * It has been AutoGen-ed December 16, 2010 at 07:19:37 PM by AutoGen 5.11.6pre2 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 33:3:8 templates. + * Generated from AutoOpts 33:4:8 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -39,7 +39,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 135171 +#define AO_TEMPLATE_VERSION 135172 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -112,6 +112,15 @@ typedef enum { DESC(n).fOptState |= OPTST_DISABLED; \ DESC(n).optCookie = NULL ) +/* * * * * * + * + * Enumeration of ntpd exit codes + */ +typedef enum { + NTPD_EXIT_SUCCESS = 0, + NTPD_EXIT_FAILURE = 1 +} ntpd_exit_code_t; + /* * Make sure there are no #define name conflicts with the option names */ @@ -332,7 +341,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 408 */ +/* extracted from /usr/local/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index fc2bec861..37481c7db 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 27, 2010 at 11:51:07 PM by AutoGen 5.11.3 +# It has been AutoGen-ed December 16, 2010 at 07:20:27 PM by AutoGen 5.11.6pre2 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -63,7 +63,66 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd is unavailable - no --help +ntpd - NTP daemon program - Ver. 4.2.6p3-RC11 +USAGE: ntpd [ - [] | --[@{=| @}] ]... + Flg Arg Option-Name Description + -4 no ipv4 Force IPv4 DNS name resolution + - prohibits these options: + ipv6 + -6 no ipv6 Force IPv6 DNS name resolution + - prohibits these options: + ipv4 + -a no authreq Require crypto authentication + - prohibits these options: + authnoreq + -A no authnoreq Do not require crypto authentication + - prohibits these options: + authreq + -b no bcastsync Allow us to sync to broadcast servers + -c Str configfile configuration file name + -d no debug-level Increase output debug message level + - may appear multiple times + -D Str set-debug-level Set the output debug message level + - may appear multiple times + -f Str driftfile frequency drift file name + -g no panicgate Allow the first adjustment to be Big + - may appear multiple times + -i --- jaildir built without --enable-clockctl or --enable-linuxcaps + -I Str interface Listen on an interface name or address + - may appear multiple times + -k Str keyfile path to symmetric keys + -l Str logfile path to the log file + -L no novirtualips Do not listen to virtual interfaces + -n no nofork Do not fork + -N no nice Run at high priority + -p Str pidfile path to the PID file + -P Num priority Process priority + -q no quit Set the time and quit + -r Str propagationdelay Broadcast/propagation delay + Str saveconfigquit Save parsed configuration and quit + -s Str statsdir Statistics file location + -t Str trustedkey Trusted key number + - may appear multiple times + -u --- user built without --enable-clockctl or --enable-linuxcaps + -U Num updateinterval interval in seconds between scans for new or dropped interfaces + Str var make ARG an ntp variable (RW) + - may appear multiple times + Str dvar make ARG an ntp variable (RW|DEF) + - may appear multiple times + -x no slew Slew up to 600 seconds + opt version Output version information and exit + -? no help Display extended usage information and exit + -! no more-help Extended usage information passed thru pager + +Options are specified by doubled hyphens and their name +or by a single hyphen and the flag character. + +The following option preset mechanisms are supported: + - examining environment variables named NTPD_* + + + +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 0617a01cd..16c592633 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2010-11-27 "( 4.2.6p3-RC11)" "Programmer's Manual" +.TH NTPD 1 2010-12-16 "( 4.2.6p3-RC11)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed November 27, 2010 at 11:51:06 PM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 16, 2010 at 07:20:27 PM by AutoGen 5.11.6pre2 .\" 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 56f0bd4b6..879b448bd 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 27, 2010 at 11:51:15 PM by AutoGen 5.11.3 + * It has been AutoGen-ed December 16, 2010 at 07:20:37 PM by AutoGen 5.11.6pre2 * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 33:3:8 templates. + * Generated from AutoOpts 33:4:8 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -479,7 +479,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 493 */ +/* extracted from /usr/local/share/autogen/optcode.tpl near line 493 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -549,7 +549,7 @@ doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc) DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); } #endif /* defined(TEST_NTPDC_OPTS) */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ +/* extracted from /usr/local/share/autogen/optmain.tpl near line 107 */ #if defined(TEST_NTPDC_OPTS) /* TEST MAIN PROCEDURE: */ @@ -567,7 +567,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPDC_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */ +/* extracted from /usr/local/share/autogen/optcode.tpl near line 626 */ #if ENABLE_NLS #include diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 46a833891..109cd5b71 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 27, 2010 at 11:51:15 PM by AutoGen 5.11.3 + * It has been AutoGen-ed December 16, 2010 at 07:20:37 PM by AutoGen 5.11.6pre2 * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 33:3:8 templates. + * Generated from AutoOpts 33:4:8 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -39,7 +39,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 135171 +#define AO_TEMPLATE_VERSION 135172 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -92,6 +92,15 @@ typedef enum { DESC(n).fOptState |= OPTST_DISABLED; \ DESC(n).optCookie = NULL ) +/* * * * * * + * + * Enumeration of ntpdc exit codes + */ +typedef enum { + NTPDC_EXIT_SUCCESS = 0, + NTPDC_EXIT_FAILURE = 1 +} ntpdc_exit_code_t; + /* * Make sure there are no #define name conflicts with the option names */ @@ -182,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 408 */ +/* extracted from /usr/local/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 8aef89b14..2ec5f3f76 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 27, 2010 at 11:51:26 PM by AutoGen 5.11.3 +# It has been AutoGen-ed December 16, 2010 at 07:20:48 PM by AutoGen 5.11.6pre2 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -58,7 +58,71 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc is unavailable - no --help +ntpdc - vendor-specific NTP query program - Ver. 4.2.6p3-RC11 +USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] + Flg Arg Option-Name Description + -4 no ipv4 Force IPv4 DNS name resolution + - prohibits these options: + ipv6 + -6 no ipv6 Force IPv6 DNS name resolution + - prohibits these options: + ipv4 + -c Str command run a command and exit + - may appear multiple times + -l no listpeers Print a list of the peers + - prohibits these options: + command + -p no peers Print a list of the peers + - prohibits these options: + command + -s no showpeers Show a list of the peers + - prohibits these options: + command + -i no interactive Force ntpq to operate in interactive mode + - prohibits these options: + command + listpeers + peers + showpeers + -d no debug-level Increase output debug message level + - may appear multiple times + -D Str set-debug-level Set the output debug message level + - may appear multiple times + -n no numeric numeric host addresses + opt version Output version information and exit + -? no help Display extended usage information and exit + -! no more-help Extended usage information passed thru pager + -> opt save-opts Save the option state to a config file + -< Str load-opts Load options from a config file + - disabled as --no-load-opts + - may appear multiple times + +Options are specified by doubled hyphens and their name +or by a single hyphen and the flag character. + +The following option preset mechanisms are supported: + - reading file /deacon/users/stenn/.ntprc + - reading file /deacon/backroom/ntp-stable/ntpdc/.ntprc + - examining environment variables named NTPDC_* + +The +[= prog-name =] +utility program is used to query an NTP daemon about its +current state and to request changes in that state. +It uses NTP mode 7 control message formats described in the source code. +The program may +be run either in interactive mode or controlled using command line +arguments. +Extensive state and statistics information is available +through the +[= prog-name =] +interface. +In addition, nearly all the +configuration options which can be specified at startup using +ntpd's configuration file may also be specified at run time using +[= prog-name =] . + +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index 0d9f759a8..fc3f9cf67 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2010-11-27 "( 4.2.6p3-RC11)" "Programmer's Manual" +.TH NTPDC 1 2010-12-16 "( 4.2.6p3-RC11)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed November 27, 2010 at 11:51:25 PM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 16, 2010 at 07:20:47 PM by AutoGen 5.11.6pre2 .\" 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 fe208b485..3965151a5 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 27, 2010 at 11:51:26 PM by AutoGen 5.11.3 + * It has been AutoGen-ed December 16, 2010 at 07:20:49 PM by AutoGen 5.11.6pre2 * From the definitions ntpq-opts.def * and the template file options * - * Generated from AutoOpts 33:3:8 templates. + * Generated from AutoOpts 33:4:8 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -448,7 +448,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 493 */ +/* extracted from /usr/local/share/autogen/optcode.tpl near line 493 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -518,7 +518,7 @@ doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc) DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); } #endif /* defined(TEST_NTPQ_OPTS) */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ +/* extracted from /usr/local/share/autogen/optmain.tpl near line 107 */ #if defined(TEST_NTPQ_OPTS) /* TEST MAIN PROCEDURE: */ @@ -536,7 +536,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPQ_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */ +/* extracted from /usr/local/share/autogen/optcode.tpl near line 626 */ #if ENABLE_NLS #include diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 8665b890f..a81f2b19b 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 27, 2010 at 11:51:26 PM by AutoGen 5.11.3 + * It has been AutoGen-ed December 16, 2010 at 07:20:49 PM by AutoGen 5.11.6pre2 * From the definitions ntpq-opts.def * and the template file options * - * Generated from AutoOpts 33:3:8 templates. + * Generated from AutoOpts 33:4:8 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -39,7 +39,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 135171 +#define AO_TEMPLATE_VERSION 135172 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -91,6 +91,15 @@ typedef enum { DESC(n).fOptState |= OPTST_DISABLED; \ DESC(n).optCookie = NULL ) +/* * * * * * + * + * Enumeration of ntpq exit codes + */ +typedef enum { + NTPQ_EXIT_SUCCESS = 0, + NTPQ_EXIT_FAILURE = 1 +} ntpq_exit_code_t; + /* * Make sure there are no #define name conflicts with the option names */ @@ -175,7 +184,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 408 */ +/* extracted from /usr/local/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 1b708b997..2d39dbd4f 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 27, 2010 at 11:51:38 PM by AutoGen 5.11.3 +# It has been AutoGen-ed December 16, 2010 at 07:21:09 PM by AutoGen 5.11.6pre2 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -47,7 +47,56 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -ntpq is unavailable - no --help +ntpq - standard NTP query program - Ver. 4.2.6p3-RC11 +USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] + Flg Arg Option-Name Description + -4 no ipv4 Force IPv4 DNS name resolution + - prohibits these options: + ipv6 + -6 no ipv6 Force IPv6 DNS name resolution + - prohibits these options: + ipv4 + -c Str command run a command and exit + - may appear multiple times + -d no debug-level Increase output debug message level + - may appear multiple times + -D Str set-debug-level Set the output debug message level + - may appear multiple times + -p no peers Print a list of the peers + - prohibits these options: + interactive + -i no interactive Force ntpq to operate in interactive mode + - prohibits these options: + command + peers + -n no numeric numeric host addresses + no old-rv Always output status line with readvar + opt version Output version information and exit + -? no help Display extended usage information and exit + -! no more-help Extended usage information passed thru pager + -> opt save-opts Save the option state to a config file + -< Str load-opts Load options from a config file + - disabled as --no-load-opts + - may appear multiple times + +Options are specified by doubled hyphens and their name +or by a single hyphen and the flag character. + +The following option preset mechanisms are supported: + - reading file /deacon/users/stenn/.ntprc + - reading file /deacon/backroom/ntp-stable/ntpq/.ntprc + - examining environment variables named NTPQ_* + +The +[= prog-name =] +utility program is used to query NTP servers which +implement the standard NTP mode 6 control message formats defined +in Appendix B of the NTPv3 specification RFC1305, requesting +information about current state and/or changes in that state. +The same formats are used in NTPv4, although some of the +variables have changed and new ones added. + +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index 157bb060f..1c3b05127 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2010-11-27 "( 4.2.6p3-RC11)" "Programmer's Manual" +.TH NTPQ 1 2010-12-16 "( 4.2.6p3-RC11)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed November 27, 2010 at 11:51:38 PM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 16, 2010 at 07:21:09 PM by AutoGen 5.11.6pre2 .\" 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 d4d5d13f1..78fc9dc31 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 27, 2010 at 11:51:39 PM by AutoGen 5.11.3 + * It has been AutoGen-ed December 16, 2010 at 07:21:10 PM by AutoGen 5.11.6pre2 * From the definitions ntpsnmpd-opts.def * and the template file options * - * Generated from AutoOpts 33:3:8 templates. + * Generated from AutoOpts 33:4:8 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -267,7 +267,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 493 */ +/* extracted from /usr/local/share/autogen/optcode.tpl near line 493 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -324,7 +324,7 @@ doUsageOpt( (void)pOptions; USAGE(EXIT_SUCCESS); } -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ +/* extracted from /usr/local/share/autogen/optmain.tpl near line 107 */ #if defined(TEST_NTPSNMPD_OPTS) /* TEST MAIN PROCEDURE: */ @@ -342,7 +342,7 @@ main(int argc, char** argv) return res; } #endif /* defined TEST_NTPSNMPD_OPTS */ -/* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 626 */ +/* extracted from /usr/local/share/autogen/optcode.tpl near line 626 */ #if ENABLE_NLS #include diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 655df190e..198ce08a8 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 27, 2010 at 11:51:38 PM by AutoGen 5.11.3 + * It has been AutoGen-ed December 16, 2010 at 07:21:10 PM by AutoGen 5.11.6pre2 * From the definitions ntpsnmpd-opts.def * and the template file options * - * Generated from AutoOpts 33:3:8 templates. + * Generated from AutoOpts 33:4:8 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -39,7 +39,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 135171 +#define AO_TEMPLATE_VERSION 135172 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -85,6 +85,15 @@ typedef enum { DESC(n).fOptState |= OPTST_DISABLED; \ DESC(n).optCookie = NULL ) +/* * * * * * + * + * Enumeration of ntpsnmpd exit codes + */ +typedef enum { + NTPSNMPD_EXIT_SUCCESS = 0, + NTPSNMPD_EXIT_FAILURE = 1 +} ntpsnmpd_exit_code_t; + /* * Make sure there are no #define name conflicts with the option names */ @@ -133,7 +142,7 @@ typedef enum { ntpsnmpdOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpsnmpdOptions.pUsageProc)(&ntpsnmpdOptions, c) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 408 */ +/* extracted from /usr/local/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index 955185216..caa5fd109 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 27, 2010 at 11:51:45 PM by AutoGen 5.11.3 +# It has been AutoGen-ed December 16, 2010 at 07:21:17 PM by AutoGen 5.11.6pre2 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -34,7 +34,29 @@ This is the automatically generated usage text for ntpsnmpd: @exampleindent 0 @example -ntpsnmpd is unavailable - no --help +ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.6p3-RC11 +USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... + Flg Arg Option-Name Description + -n no nofork Do not fork + -p no syslog Log to syslog() + Str agentxsocket The socket address ntpsnmpd uses to connect to net-snmpd + opt version Output version information and exit + -? no help Display extended usage information and exit + -! no more-help Extended usage information passed thru pager + -> opt save-opts Save the option state to a config file + -< Str load-opts Load options from a config file + - disabled as --no-load-opts + - may appear multiple times + +Options are specified by doubled hyphens and their name +or by a single hyphen and the flag character. + +The following option preset mechanisms are supported: + - reading file /deacon/users/stenn/.ntprc + - reading file /deacon/backroom/ntp-stable/ntpsnmpd/.ntprc + - examining environment variables named NTPSNMPD_* + +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index afe1dc835..e21c8a2c5 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2010-11-27 "( 4.2.6p3-RC11)" "Programmer's Manual" +.TH NTPSNMPD 1 2010-12-16 "( 4.2.6p3-RC11)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed November 27, 2010 at 11:51:44 PM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 16, 2010 at 07:21:17 PM by AutoGen 5.11.6pre2 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 2e891b079..0c394f43e 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 27, 2010 at 11:51:47 PM by AutoGen 5.11.3 + * It has been AutoGen-ed December 16, 2010 at 07:21:23 PM by AutoGen 5.11.6pre2 * From the definitions ntp-keygen-opts.def * and the template file options * - * Generated from AutoOpts 33:3:8 templates. + * Generated from AutoOpts 33:4:8 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -741,7 +741,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 493 */ +/* extracted from /usr/local/share/autogen/optcode.tpl near line 493 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -864,7 +864,7 @@ doOptModulus(tOptions* pOptions, tOptDesc* pOptDesc) pOptDesc->optArg.argInt = val; } #endif /* defined OPENSSL */ -/* extracted from /usr/local/gnu/share/autogen/optmain.tpl near line 107 */ +/* extracted from /usr/local/share/autogen/optmain.tpl near line 107 */ #if defined(TEST_NTP_KEYGEN_OPTS) /* TEST MAIN PROCEDURE: */ @@ -882,7 +882,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 626 */ +/* extracted from /usr/local/share/autogen/optcode.tpl near line 626 */ #if ENABLE_NLS #include diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index f08f30abf..0c84cf797 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 27, 2010 at 11:51:46 PM by AutoGen 5.11.3 + * It has been AutoGen-ed December 16, 2010 at 07:21:23 PM by AutoGen 5.11.6pre2 * From the definitions ntp-keygen-opts.def * and the template file options * - * Generated from AutoOpts 33:3:8 templates. + * Generated from AutoOpts 33:4:8 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -39,7 +39,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 135171 +#define AO_TEMPLATE_VERSION 135172 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -100,6 +100,15 @@ typedef enum { DESC(n).fOptState |= OPTST_DISABLED; \ DESC(n).optCookie = NULL ) +/* * * * * * + * + * Enumeration of ntp-keygen exit codes + */ +typedef enum { + NTP_KEYGEN_EXIT_SUCCESS = 0, + NTP_KEYGEN_EXIT_FAILURE = 1 +} ntp_keygen_exit_code_t; + /* * Make sure there are no #define name conflicts with the option names */ @@ -250,7 +259,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 408 */ +/* extracted from /usr/local/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index b3121d29e..b75a7d74f 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 27, 2010 at 11:51:53 PM by AutoGen 5.11.3 +# It has been AutoGen-ed December 16, 2010 at 07:21:35 PM by AutoGen 5.11.6pre2 # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore @@ -50,7 +50,50 @@ This is the automatically generated usage text for ntp-keygen: @exampleindent 0 @example -ntp-keygen is unavailable - no --help +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.6p3-RC11 +USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... + Flg Arg Option-Name Description + -c Str certificate certificate scheme + -d no debug-level Increase output debug message level + - may appear multiple times + -D Str set-debug-level Set the output debug message level + - may appear multiple times + -e no id-key Write IFF or GQ identity keys + -G no gq-params Generate GQ parameters and keys + -H no host-key generate RSA host key + -I no iffkey generate IFF parameters + -i Str issuer-name set issuer name + -M no md5key generate MD5 keys + -m Num modulus modulus + - it must be: 256 to 2048 + -P no pvt-cert generate PC private certificate + -p Str pvt-passwd output private password + -q Str get-pvt-passwd input private password + -S Str sign-key generate sign key (RSA or DSA) + -s Str subject-name set subject name + -T no trusted-cert trusted certificate (TC scheme) + -V Num mv-params generate MV parameters + -v Num mv-keys update MV keys + opt version Output version information and exit + -? no help Display extended usage information and exit + -! no more-help Extended usage information passed thru pager + -> opt save-opts Save the option state to a config file + -< Str load-opts Load options from a config file + - disabled as --no-load-opts + - may appear multiple times + +Options are specified by doubled hyphens and their name +or by a single hyphen and the flag character. + +The following option preset mechanisms are supported: + - reading file /deacon/users/stenn/.ntprc + - reading file /deacon/backroom/ntp-stable/util/.ntprc + - examining environment variables named NTP_KEYGEN_* + +If there is no new host key, look for an existing one. +If one is not found, create it. + +please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org @end example @exampleindent 4 diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index 44b9fa052..a5fa4f454 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2010-11-27 "(ntp 4.2.6p3-RC11)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2010-12-16 "(ntp 4.2.6p3-RC11)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed November 27, 2010 at 11:51:52 PM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 16, 2010 at 07:21:35 PM by AutoGen 5.11.6pre2 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"