From: Harlan Stenn Date: Fri, 17 Dec 2010 04:38:38 +0000 (+0000) Subject: NTP_4_2_7P95 X-Git-Tag: NTP_4_2_7P95^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e7515521a0974461b5b7aa7cfe51c0e0fb68973b;p=thirdparty%2Fntp.git NTP_4_2_7P95 bk: 4d0ae94e354nDlUffSWkNEw7SUDLQQ --- diff --git a/ChangeLog b/ChangeLog index badc21ab2..cfc9d7236 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p95) 2010/12/17 Released by Harlan Stenn * [Bug 1753] 4.2.7p94 faults on startup in newpeer(), strdup(NULL). * [Bug 1754] from 4.2.6p3-RC12: --version output should be more verbose. * [Bug 1757] from 4.2.6p3-RC12: oncore snprintf("%m") doesn't expand %m. diff --git a/clockstuff/clktest-opts.c b/clockstuff/clktest-opts.c index 4a7f3ff9e..c90447a46 100644 --- a/clockstuff/clktest-opts.c +++ b/clockstuff/clktest-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (clktest-opts.c) * - * It has been AutoGen-ed December 15, 2010 at 10:12:17 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:38:04 AM by AutoGen 5.11.6pre1 * From the definitions clktest-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 @@ -325,7 +325,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "CLKTEST"; tSCC zUsageTitle[] = -"clktest - test the clock line discipline - Ver. 4.2.7p94\n\ +"clktest - test the clock line discipline - Ver. 4.2.7p95\n\ USAGE: %s [ - [] | --[{=| }] ]... \n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/clockstuff/clktest-opts.h b/clockstuff/clktest-opts.h index 45dbcad94..401418b63 100644 --- a/clockstuff/clktest-opts.h +++ b/clockstuff/clktest-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (clktest-opts.h) * - * It has been AutoGen-ed December 15, 2010 at 10:12:16 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:38:04 AM by AutoGen 5.11.6pre1 * From the definitions clktest-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 @@ -63,8 +63,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 10 -#define CLKTEST_VERSION "4.2.7p94" -#define CLKTEST_FULL_VERSION "clktest - test the clock line discipline - Ver. 4.2.7p94" +#define CLKTEST_VERSION "4.2.7p95" +#define CLKTEST_FULL_VERSION "clktest - test the clock line discipline - Ver. 4.2.7p95" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -87,6 +87,15 @@ typedef enum { DESC(n).fOptState |= OPTST_DISABLED; \ DESC(n).optCookie = NULL ) +/* * * * * * + * + * Enumeration of clktest exit codes + */ +typedef enum { + CLKTEST_EXIT_SUCCESS = 0, + CLKTEST_EXIT_FAILURE = 1 +} clktest_exit_code_t; + /* * Make sure there are no #define name conflicts with the option names */ @@ -149,7 +158,7 @@ typedef enum { clktestOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*clktestOptions.pUsageProc)(&clktestOptions, c) -/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 408 */ +/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 117682fcd..43338a01e 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 December 15, 2010 at 10:10:08 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:36:28 AM by AutoGen 5.11.6pre1 * 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 @@ -1006,7 +1006,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.7p94\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p95\n\ USAGE: %s [ - [] | --[{=| }] ]... \\\n\ \t\t[ ... ]\n"; #define zRcName NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index c40bb2d4c..35293b4b0 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 December 15, 2010 at 10:10:08 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:36:27 AM by AutoGen 5.11.6pre1 * 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 @@ -89,8 +89,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 36 -#define NTPD_VERSION "4.2.7p94" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p94" +#define NTPD_VERSION "4.2.7p95" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p95" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -113,6 +113,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 */ @@ -343,7 +352,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/gnu/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index aa89b689f..0f646394f 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 December 15, 2010 at 10:11:17 AM by AutoGen 5.11.3 +# It has been AutoGen-ed December 17, 2010 at 04:37:20 AM by AutoGen 5.11.6pre1 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -64,80 +64,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p94 -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 - - prohibits these options: - wait-sync - -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 - - prohibits these options: - saveconfigquit - wait-sync - -r Str propagationdelay Broadcast/propagation delay - Str saveconfigquit Save parsed configuration and quit - - prohibits these options: - quit - wait-sync - -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 - -w Num wait-sync Seconds to wait for first clock sync - - prohibits these options: - nofork - quit - saveconfigquit - -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 +ntpd is unavailable - no --help @end example @exampleindent 4 diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 16aaeb1d0..94a2b7c73 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2010-12-15 "( 4.2.7p94)" "Programmer's Manual" +.TH NTPD 1 2010-12-17 "( 4.2.7p95)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed December 15, 2010 at 10:11:17 AM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 17, 2010 at 04:37:20 AM by AutoGen 5.11.6pre1 .\" 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 788124d71..4a9c949a8 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 December 15, 2010 at 10:11:33 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:37:28 AM by AutoGen 5.11.6pre1 * 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 @@ -451,7 +451,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p94\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p95\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 7cb0a72fb..675a96e5c 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 December 15, 2010 at 10:11:28 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:37:28 AM by AutoGen 5.11.6pre1 * 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 @@ -68,8 +68,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.7p94" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p94" +#define NTPDC_VERSION "4.2.7p95" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p95" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -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/gnu/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index c9273cee1..448465d89 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 December 15, 2010 at 10:11:50 AM by AutoGen 5.11.3 +# It has been AutoGen-ed December 17, 2010 at 04:37:41 AM by AutoGen 5.11.6pre1 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -58,71 +58,7 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTP query program - Ver. 4.2.7p94 -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/snaps/ntp-dev/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 +ntpdc is unavailable - no --help @end example @exampleindent 4 diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index d6b7c3f01..7263d3299 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2010-12-15 "( 4.2.7p94)" "Programmer's Manual" +.TH NTPDC 1 2010-12-17 "( 4.2.7p95)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed December 15, 2010 at 10:11:49 AM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 17, 2010 at 04:37:41 AM by AutoGen 5.11.6pre1 .\" 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 0d47ac9f3..3014b293e 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 December 15, 2010 at 10:11:50 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:37:42 AM by AutoGen 5.11.6pre1 * 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 @@ -428,7 +428,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.7p94\n\ +"ntpq - standard NTP query program - Ver. 4.2.7p95\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 9ac9a4583..795ca54e9 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 December 15, 2010 at 10:11:50 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:37:42 AM by AutoGen 5.11.6pre1 * 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 @@ -67,8 +67,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 14 -#define NTPQ_VERSION "4.2.7p94" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p94" +#define NTPQ_VERSION "4.2.7p95" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p95" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -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/gnu/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 2f48f5da6..a1c75d460 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 December 15, 2010 at 10:12:10 AM by AutoGen 5.11.3 +# It has been AutoGen-ed December 17, 2010 at 04:37:56 AM by AutoGen 5.11.6pre1 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -47,56 +47,7 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.7p94 -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/snaps/ntp-dev/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 +ntpq is unavailable - no --help @end example @exampleindent 4 diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index 75f9a5ed7..5cafe0dd4 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2010-12-15 "( 4.2.7p94)" "Programmer's Manual" +.TH NTPQ 1 2010-12-17 "( 4.2.7p95)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed December 15, 2010 at 10:12:09 AM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 17, 2010 at 04:37:55 AM by AutoGen 5.11.6pre1 .\" 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 833b27941..60e9f2d27 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 December 15, 2010 at 10:12:10 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:37:56 AM by AutoGen 5.11.6pre1 * 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 @@ -255,7 +255,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p94\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p95\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 6dad95ad0..1457d9f29 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 December 15, 2010 at 10:12:10 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:37:56 AM by AutoGen 5.11.6pre1 * 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 @@ -61,8 +61,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 8 -#define NTPSNMPD_VERSION "4.2.7p94" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p94" +#define NTPSNMPD_VERSION "4.2.7p95" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p95" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -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/gnu/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index e369005f9..aaa7df798 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 December 15, 2010 at 10:12:16 AM by AutoGen 5.11.3 +# It has been AutoGen-ed December 17, 2010 at 04:38:03 AM by AutoGen 5.11.6pre1 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -34,29 +34,7 @@ This is the automatically generated usage text for ntpsnmpd: @exampleindent 0 @example -ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p94 -USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... - Flg Arg Option-Name Description - -n no nofork Do not fork - -p no syslog Log to syslog() - Str agentxsocket The socket address ntpsnmpd uses to connect to net-snmpd - opt version Output version information and exit - -? no help Display extended usage information and exit - -! no more-help Extended usage information passed thru pager - -> opt save-opts Save the option state to a config file - -< Str load-opts Load options from a config file - - disabled as --no-load-opts - - may appear multiple times - -Options are specified by doubled hyphens and their name -or by a single hyphen and the flag character. - -The following option preset mechanisms are supported: - - reading file /deacon/users/stenn/.ntprc - - reading file /deacon/backroom/snaps/ntp-dev/ntpsnmpd/.ntprc - - examining environment variables named NTPSNMPD_* - -please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org +ntpsnmpd is unavailable - no --help @end example @exampleindent 4 diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index c708c878b..6c4ddbac2 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2010-12-15 "( 4.2.7p94)" "Programmer's Manual" +.TH NTPSNMPD 1 2010-12-17 "( 4.2.7p95)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed December 15, 2010 at 10:12:16 AM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 17, 2010 at 04:38:03 AM by AutoGen 5.11.6pre1 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 1537cdeac..b6da4863d 100644 --- a/packageinfo.sh +++ b/packageinfo.sh @@ -57,7 +57,7 @@ CLTAG=NTP_4_2_0 # - Numeric values increment # - empty 'increments' to 1 # - NEW 'increments' to empty -point=94 +point=95 ### betapoint is normally modified by script. # ntp-stable Beta number (betapoint) diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 3920ed0e2..9a96b4a94 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 December 15, 2010 at 10:09:56 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:36:20 AM by AutoGen 5.11.6pre1 * From the definitions sntp-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 @@ -473,7 +473,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.7p94\n\ +"sntp - standard SNTP program - Ver. 4.2.7p95\n\ USAGE: %s [ - [] | --[{=| }] ]... hostname-or-IP ...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 1dfe31d85..30bf45fec 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 December 15, 2010 at 10:09:56 AM by AutoGen 5.11.3 + * It has been AutoGen-ed December 17, 2010 at 04:36:19 AM by AutoGen 5.11.6pre1 * From the definitions sntp-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 @@ -70,8 +70,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 17 -#define SNTP_VERSION "4.2.7p94" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p94" +#define SNTP_VERSION "4.2.7p95" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p95" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -94,6 +94,15 @@ typedef enum { DESC(n).fOptState |= OPTST_DISABLED; \ DESC(n).optCookie = NULL ) +/* * * * * * + * + * Enumeration of sntp exit codes + */ +typedef enum { + SNTP_EXIT_SUCCESS = 0, + SNTP_EXIT_FAILURE = 1 +} sntp_exit_code_t; + /* * Make sure there are no #define name conflicts with the option names */ @@ -200,7 +209,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 408 */ +/* extracted from /usr/local/gnu/share/autogen/opthead.tpl near line 435 */ /* * * * * * * diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 3f8977158..51ceb6248 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 December 15, 2010 at 10:10:07 AM by AutoGen 5.11.3 +# It has been AutoGen-ed December 17, 2010 at 04:36:26 AM by AutoGen 5.11.6pre1 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore @@ -68,61 +68,7 @@ This is the automatically generated usage text for sntp: @exampleindent 0 @example -sntp - standard SNTP program - Ver. 4.2.7p94 -USAGE: sntp [ - [] | --[@{=| @}] ]... hostname-or-IP ... - 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 - -d no normalverbose Normal verbose - -K Str kod KoD history filename - -p no syslog Logging with syslog - - prohibits these options: - filelog - -l Str filelog Log to specified logfile - - prohibits these options: - syslog - -s no settod Set (step) the time with settimeofday() - - prohibits these options: - adjtime - -j no adjtime Set (slew) the time with adjtime() - - prohibits these options: - settod - -b Str broadcast Use broadcasts to the address specified for synchronisation - -t Num timeout Specify the number of seconds to wait for broadcasts - -a Num authentication Enable authentication with the key auth-keynumber - -k Str keyfile Specify a keyfile. SNTP will look in this file for the key specified with -a - opt version Output version information and exit - -? no help Display extended usage information and exit - -! no more-help Extended usage information passed thru pager - -> opt save-opts Save the option state to a config file - -< Str load-opts Load options from a config file - - disabled as --no-load-opts - - may appear multiple times - -Options are specified by doubled hyphens and their name -or by a single hyphen and the flag character. - - - -The following option preset mechanisms are supported: - - reading file /deacon/users/stenn/.ntprc - - reading file /deacon/backroom/snaps/ntp-dev/sntp/.ntprc - - examining environment variables named SNTP_* - -sntp implements the Simple Network Time Protocol, and is used to query -an NTP or SNTP server and either display the time or set the local -system's time (given suitable privilege). - -It can be run interactively from the command line or as a cron job. - -NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC -1305. - -please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org +sntp is unavailable - no --help @end example @exampleindent 4 diff --git a/sntp/sntp.1 b/sntp/sntp.1 index b29f63fe0..77d79a144 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2010-12-15 "( 4.2.7p94)" "Programmer's Manual" +.TH SNTP 1 2010-12-17 "( 4.2.7p95)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed December 15, 2010 at 10:10:06 AM by AutoGen 5.11.3 +.\" It has been AutoGen-ed December 17, 2010 at 04:36:26 AM by AutoGen 5.11.6pre1 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/sntp/sntp.html b/sntp/sntp.html index 640b96658..fef06eff4 100644 --- a/sntp/sntp.html +++ b/sntp/sntp.html @@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. -

This document applies to version 4.2.7p94 of sntp. +

This document applies to version 4.2.7p95 of sntp.

The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -138,61 +138,7 @@ Up: sntp Invocation

This is the automatically generated usage text for sntp: -

sntp - standard SNTP program - Ver. 4.2.7p94
-USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... hostname-or-IP ...
-  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
-   -d no  normalverbose  Normal verbose
-   -K Str kod            KoD history filename
-   -p no  syslog         Logging with syslog
-                                - prohibits these options:
-                                filelog
-   -l Str filelog        Log to specified logfile
-                                - prohibits these options:
-                                syslog
-   -s no  settod         Set (step) the time with settimeofday()
-                                - prohibits these options:
-                                adjtime
-   -j no  adjtime        Set (slew) the time with adjtime()
-                                - prohibits these options:
-                                settod
-   -b Str broadcast      Use broadcasts to the address specified for synchronisation
-   -t Num timeout        Specify the number of seconds to wait for broadcasts
-   -a Num authentication Enable authentication with the key auth-keynumber
-   -k Str keyfile        Specify a keyfile. SNTP will look in this file for the key specified with -a
-      opt version        Output version information and exit
-   -? no  help           Display extended usage information and exit
-   -! no  more-help      Extended usage information passed thru pager
-   -> opt save-opts      Save the option state to a config file
-   -< Str load-opts      Load options from a config file
-                                - disabled as --no-load-opts
-                                - may appear multiple times
-
-Options are specified by doubled hyphens and their name
-or by a single hyphen and the flag character.
-
-
-
-The following option preset mechanisms are supported:
- - reading file /deacon/users/stenn/.ntprc
- - reading file /deacon/backroom/snaps/ntp-dev/sntp/.ntprc
- - examining environment variables named SNTP_*
-
-sntp implements the Simple Network Time Protocol, and is used to query
-an NTP or SNTP server and either display the time or set the local
-system's time (given suitable privilege).
-
-It can be run interactively from the command line or as a cron job.
-
-NTP and SNTP are defined by RFC 5905, which obsoletes RFC 4330 and RFC
-1305.
-
-please send bug reports to:  http://bugs.ntp.org, bugs@ntp.org
+
sntp is unavailable - no --help
 

   

 

diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index bb2de6a06..26bac58b2 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  December 15, 2010 at 10:12:19 AM by AutoGen 5.11.3
+ *  It has been AutoGen-ed  December 17, 2010 at 04:38:08 AM by AutoGen 5.11.6pre1
  *  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
@@ -757,7 +757,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTP_KEYGEN";
 tSCC   zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p94\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p95\n\
 USAGE:  %s [ - [] | --[{=| }] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index fc0d528a5..7228d7959 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  December 15, 2010 at 10:12:19 AM by AutoGen 5.11.3
+ *  It has been AutoGen-ed  December 17, 2010 at 04:38:08 AM by AutoGen 5.11.6pre1
  *  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
@@ -77,8 +77,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.7p94"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p94"
+#define NTP_KEYGEN_VERSION       "4.2.7p95"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p95"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -101,6 +101,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
  */
@@ -261,7 +270,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/gnu/share/autogen/opthead.tpl near line 435 */
 
 /* * * * * *
  *
diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index b86d9ac19..bec5fd4eb 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  December 15, 2010 at 10:12:29 AM by AutoGen 5.11.3
+# It has been AutoGen-ed  December 17, 2010 at 04:38:20 AM by AutoGen 5.11.6pre1
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -51,52 +51,7 @@ This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-Using OpenSSL version 90704f
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p94
-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
-   -l Num lifetime       set certificate lifetime
-   -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/snaps/ntp-dev/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
+ntp-keygen is unavailable - no --help
 @end example
 @exampleindent 4
 
diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index c7c01e375..f79a309ed 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2010-12-15 "(ntp 4.2.7p94)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2010-12-17 "(ntp 4.2.7p95)" "Programmer's Manual"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  December 15, 2010 at 10:12:29 AM by AutoGen 5.11.3
+.\"  It has been AutoGen-ed  December 17, 2010 at 04:38:19 AM by AutoGen 5.11.6pre1
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"