From: Harlan Stenn Date: Mon, 17 Nov 2008 11:53:07 +0000 (-0500) Subject: NTP_4_2_5P143 X-Git-Tag: NTP_4_2_5P143^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9afd71bfb0fe82b2748fe015b1bc3810e16bd480;p=thirdparty%2Fntp.git NTP_4_2_5P143 bk: 49215b23zHzH7_llv-TwH_37TSRAdg --- diff --git a/ChangeLog b/ChangeLog index 9ceb3250e..3a22193bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.5p143) 2008/11/17 Released by Harlan Stenn * sntp cleanup and fixes. (4.2.5p142) 2008/11/16 Released by Harlan Stenn * Imported GSoC SNTP code from Johannes Maximilian Kühn. diff --git a/gsoc_sntp/sntp-opts.c b/gsoc_sntp/sntp-opts.c index 02e270c3c..7a4b1ced3 100644 --- a/gsoc_sntp/sntp-opts.c +++ b/gsoc_sntp/sntp-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.c) * - * It has been AutoGen-ed Monday November 17, 2008 at 03:26:32 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:50:45 AM EST * From the definitions sntp-opts.def * and the template file options * @@ -181,7 +181,7 @@ tSCC zKeyfile_Name[] = "keyfile"; | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Help/More_Help option descriptions: + * Help/More_Help/Version option descriptions: */ tSCC zHelpText[] = "Display usage information and exit"; tSCC zHelp_Name[] = "help"; @@ -189,6 +189,9 @@ tSCC zHelp_Name[] = "help"; tSCC zMore_HelpText[] = "Extended usage information passed thru pager"; tSCC zMore_Help_Name[] = "more-help"; +tSCC zVersionText[] = "Output version information and exit"; +tSCC zVersion_Name[] = "version"; + /* * Save/Load_Opts option description: */ @@ -210,7 +213,7 @@ tSCC zNotLoad_Opts_Pfx[] = "no"; * if multiple copies are allowed. */ extern tOptProc - optionNumericVal, optionPagedUsage; + optionNumericVal, optionPagedUsage, optionVersionStderr; static tOptProc doUsageOpt; @@ -219,10 +222,15 @@ static tOptProc * When not under test, there are different procs to use */ extern tOptProc - optionNumericVal, optionPagedUsage; + optionNumericVal, optionPagedUsage, optionPrintVersion; static tOptProc doUsageOpt; #endif /* defined(TEST_SNTP_OPTS) */ +#ifdef TEST_SNTP_OPTS +# define DOVERPROC optionVersionStderr +#else +# define DOVERPROC optionPrintVersion +#endif /* TEST_SNTP_OPTS */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -373,6 +381,28 @@ 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, + /* last opt argumnt */ { NULL }, + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ DOVERPROC, + /* desc, NAME, name */ zVersionText, NULL, zVersion_Name, + /* disablement strs */ NULL, NULL }, + +#undef VERSION_OPT_FLAGS + + { /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, @@ -430,7 +460,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program\n\ +"sntp - standard SNTP program - Ver. 4.2.5p143\n\ USAGE: %s [ - [] | --[{=| }] ]... ...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -449,7 +479,7 @@ run as an interactive command or in a\n\ 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"; -#define zFullVersion NULL +tSCC zFullVersion[] = SNTP_FULL_VERSION; /* extracted from /usr/local/gnu/share/autogen/optcode.tpl near line 408 */ #if defined(ENABLE_NLS) @@ -488,7 +518,7 @@ tOptions sntpOptions = { NO_EQUIVALENT /* index of '-#' option */, NO_EQUIVALENT /* index of default opt */ }, - 16 /* full option count */, 12 /* user option count */ + 17 /* full option count */, 12 /* user option count */ }; /* diff --git a/gsoc_sntp/sntp-opts.h b/gsoc_sntp/sntp-opts.h index 13dc868a8..31a8c72de 100644 --- a/gsoc_sntp/sntp-opts.h +++ b/gsoc_sntp/sntp-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.h) * - * It has been AutoGen-ed Monday November 17, 2008 at 03:26:32 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:50:44 AM EST * From the definitions sntp-opts.def * and the template file options * @@ -64,13 +64,16 @@ typedef enum { INDEX_OPT_TIMEOUT = 9, INDEX_OPT_AUTHENTICATION = 10, INDEX_OPT_KEYFILE = 11, - INDEX_OPT_HELP = 12, - INDEX_OPT_MORE_HELP = 13, - INDEX_OPT_SAVE_OPTS = 14, - INDEX_OPT_LOAD_OPTS = 15 + INDEX_OPT_VERSION = 12, + INDEX_OPT_HELP = 13, + INDEX_OPT_MORE_HELP = 14, + INDEX_OPT_SAVE_OPTS = 15, + INDEX_OPT_LOAD_OPTS = 16 } teOptIndex; -#define OPTION_CT 16 +#define OPTION_CT 17 +#define SNTP_VERSION "4.2.5p143" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p143" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -93,6 +96,73 @@ typedef enum { DESC(n).fOptState |= OPTST_DISABLED; \ DESC(n).optCookie = NULL ) +/* + * Make sure there are no #define name conflicts with the option names + */ +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef IPV4 +# warning undefining IPV4 due to option name conflict +# undef IPV4 +# endif +# ifdef IPV6 +# warning undefining IPV6 due to option name conflict +# undef IPV6 +# endif +# ifdef NORMALVERBOSE +# warning undefining NORMALVERBOSE due to option name conflict +# undef NORMALVERBOSE +# endif +# ifdef KOD +# warning undefining KOD due to option name conflict +# undef KOD +# endif +# ifdef SYSLOG +# warning undefining SYSLOG due to option name conflict +# undef SYSLOG +# endif +# ifdef FILELOG +# warning undefining FILELOG due to option name conflict +# undef FILELOG +# endif +# ifdef SETTOD +# warning undefining SETTOD due to option name conflict +# undef SETTOD +# endif +# ifdef ADJTIME +# warning undefining ADJTIME due to option name conflict +# undef ADJTIME +# endif +# ifdef BROADCAST +# warning undefining BROADCAST due to option name conflict +# undef BROADCAST +# endif +# ifdef TIMEOUT +# warning undefining TIMEOUT due to option name conflict +# undef TIMEOUT +# endif +# ifdef AUTHENTICATION +# warning undefining AUTHENTICATION due to option name conflict +# undef AUTHENTICATION +# endif +# ifdef KEYFILE +# warning undefining KEYFILE due to option name conflict +# undef KEYFILE +# endif +#else /* NO_OPTION_NAME_WARNINGS */ +# undef IPV4 +# undef IPV6 +# undef NORMALVERBOSE +# undef KOD +# undef SYSLOG +# undef FILELOG +# undef SETTOD +# undef ADJTIME +# undef BROADCAST +# undef TIMEOUT +# undef AUTHENTICATION +# undef KEYFILE +#endif /* NO_OPTION_NAME_WARNINGS */ + /* * Interface defines for specific options. */ @@ -113,6 +183,7 @@ typedef enum { #define OPT_VALUE_AUTHENTICATION (DESC(AUTHENTICATION).optArg.argInt) #define VALUE_OPT_KEYFILE 'k' +#define VALUE_OPT_VERSION 'v' #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' #define VALUE_OPT_SAVE_OPTS '>' diff --git a/gsoc_sntp/sntp-opts.texi b/gsoc_sntp/sntp-opts.texi index ae1bc1d1d..c4e036642 100644 --- a/gsoc_sntp/sntp-opts.texi +++ b/gsoc_sntp/sntp-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (sntp-opts.texi) # -# It has been AutoGen-ed Monday November 17, 2008 at 03:26:34 AM EST +# It has been AutoGen-ed Monday November 17, 2008 at 06:50:47 AM EST # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore diff --git a/gsoc_sntp/sntp.1 b/gsoc_sntp/sntp.1 index e9d0c5fb4..2ddd83ef3 100644 --- a/gsoc_sntp/sntp.1 +++ b/gsoc_sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2008-11-17 "" "Programmer's Manual" +.TH SNTP 1 2008-11-17 "( 4.2.5p143)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed Monday November 17, 2008 at 03:26:33 AM EST +.\" It has been AutoGen-ed Monday November 17, 2008 at 06:50:46 AM EST .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" @@ -264,6 +264,11 @@ Load options from \fIrcfile\fP. The \fIno-load-opts\fP form will disable the loading of earlier RC/INI files. \fI--no-load-opts\fP is handled early, out of order. +.TP +.BR \-v " [{\fIv|c|n\fP}]," " \--version" "[=\fI{v|c|n}\fP]" +Output version of program and exit. The default mode is `v', a simple +version. The `c' mode will print copyright information and `n' will +print the full copyright notice. .SH OPTION PRESETS Any option that is not marked as \fInot presettable\fP may be preset by loading values from configuration ("RC" or ".INI") file(s) and values from diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 00a128ef5..1f10cc693 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed Sunday November 16, 2008 at 06:47:54 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:37:42 AM EST * From the definitions ntpd-opts.def * and the template file options * @@ -853,7 +853,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.5p142\n\ +"ntpd - NTP daemon program - Ver. 4.2.5p143\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 187561f94..06f18bc0c 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed Sunday November 16, 2008 at 06:47:53 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:37:41 AM EST * From the definitions ntpd-opts.def * and the template file options * @@ -87,8 +87,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 32 -#define NTPD_VERSION "4.2.5p142" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p142" +#define NTPD_VERSION "4.2.5p143" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.5p143" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index fbad43292..a2dc0aa74 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 Sunday November 16, 2008 at 06:47:57 AM EST +# It has been AutoGen-ed Monday November 17, 2008 at 06:37:45 AM EST # 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 e715b8d7a..5027ae847 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2008-11-16 "( 4.2.5p142)" "Programmer's Manual" +.TH NTPD 1 2008-11-17 "( 4.2.5p143)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed Sunday November 16, 2008 at 06:47:55 AM EST +.\" It has been AutoGen-ed Monday November 17, 2008 at 06:37:43 AM EST .\" 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 4c997787f..75aa1e896 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed Sunday November 16, 2008 at 06:54:46 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:44:34 AM EST * From the definitions ntpdc-opts.def * and the template file options * @@ -462,7 +462,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p142\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.5p143\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 7380ec643..0eb83c3e8 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed Sunday November 16, 2008 at 06:54:45 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:44:34 AM EST * From the definitions ntpdc-opts.def * and the template file options * @@ -70,8 +70,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.5p142" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p142" +#define NTPDC_VERSION "4.2.5p143" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.5p143" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 955f62fed..ea88065bd 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 Sunday November 16, 2008 at 06:54:47 AM EST +# It has been AutoGen-ed Monday November 17, 2008 at 06:44:36 AM EST # 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 8ac2349f3..68e86fdc3 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2008-11-16 "( 4.2.5p142)" "Programmer's Manual" +.TH NTPDC 1 2008-11-17 "( 4.2.5p143)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed Sunday November 16, 2008 at 06:54:47 AM EST +.\" It has been AutoGen-ed Monday November 17, 2008 at 06:44:35 AM EST .\" 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 5d2905a98..b21d1450f 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.c) * - * It has been AutoGen-ed Sunday November 16, 2008 at 06:55:16 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:45:04 AM EST * From the definitions ntpq-opts.def * and the template file options * @@ -410,7 +410,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.5p142\n\ +"ntpq - standard NTP query program - Ver. 4.2.5p143\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 00b1f9d78..3a9200b9a 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpq-opts.h) * - * It has been AutoGen-ed Sunday November 16, 2008 at 06:55:16 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:45:04 AM EST * From the definitions ntpq-opts.def * and the template file options * @@ -68,8 +68,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define NTPQ_VERSION "4.2.5p142" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p142" +#define NTPQ_VERSION "4.2.5p143" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.5p143" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 605d5a07e..af86728be 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 Sunday November 16, 2008 at 06:55:19 AM EST +# It has been AutoGen-ed Monday November 17, 2008 at 06:45:06 AM EST # 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 5407c8aad..543a7252f 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2008-11-16 "( 4.2.5p142)" "Programmer's Manual" +.TH NTPQ 1 2008-11-17 "( 4.2.5p143)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed Sunday November 16, 2008 at 06:55:18 AM EST +.\" It has been AutoGen-ed Monday November 17, 2008 at 06:45:05 AM EST .\" 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 098782ecc..ea218ea83 100644 --- a/ntpsnmpd/ntpsnmpd-opts.c +++ b/ntpsnmpd/ntpsnmpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.c) * - * It has been AutoGen-ed Sunday November 16, 2008 at 06:56:01 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:45:49 AM EST * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -228,7 +228,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p142\n\ +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p143\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index 209ca8993..8f9881bbd 100644 --- a/ntpsnmpd/ntpsnmpd-opts.h +++ b/ntpsnmpd/ntpsnmpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpsnmpd-opts.h) * - * It has been AutoGen-ed Sunday November 16, 2008 at 06:56:01 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:45:49 AM EST * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -62,8 +62,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 7 -#define NTPSNMPD_VERSION "4.2.5p142" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p142" +#define NTPSNMPD_VERSION "4.2.5p143" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.5p143" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index 3eedb39a9..f09053256 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 Sunday November 16, 2008 at 06:56:03 AM EST +# It has been AutoGen-ed Monday November 17, 2008 at 06:45:51 AM EST # 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 8e9d2efcf..7abe4da9a 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2008-11-16 "( 4.2.5p142)" "Programmer's Manual" +.TH NTPSNMPD 1 2008-11-17 "( 4.2.5p143)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed Sunday November 16, 2008 at 06:56:02 AM EST +.\" It has been AutoGen-ed Monday November 17, 2008 at 06:45:50 AM EST .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 605d29ad4..8b9794799 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=142 +point=143 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 35a9c863a..62c34b1b8 100644 --- a/sntp/sntp-opts.c +++ b/sntp/sntp-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.c) * - * It has been AutoGen-ed Sunday November 16, 2008 at 07:02:12 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:51:57 AM EST * From the definitions sntp-opts.def * and the template file options * @@ -513,7 +513,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.5p142\n\ +"sntp - standard SNTP program - Ver. 4.2.5p143\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 0824c03cb..d1b03d1e6 100644 --- a/sntp/sntp-opts.h +++ b/sntp/sntp-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (sntp-opts.h) * - * It has been AutoGen-ed Sunday November 16, 2008 at 07:02:11 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:51:56 AM EST * From the definitions sntp-opts.def * and the template file options * @@ -147,8 +147,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define SNTP_VERSION "4.2.5p142" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p142" +#define SNTP_VERSION "4.2.5p143" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.5p143" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 913cf692a..179fee626 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 Sunday November 16, 2008 at 07:02:14 AM EST +# It has been AutoGen-ed Monday November 17, 2008 at 06:51:59 AM EST # 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 816c157a6..2f126e10e 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2008-11-16 "( 4.2.5p142)" "Programmer's Manual" +.TH SNTP 1 2008-11-17 "( 4.2.5p143)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed Sunday November 16, 2008 at 07:02:13 AM EST +.\" It has been AutoGen-ed Monday November 17, 2008 at 06:51:58 AM EST .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index a77db8506..810b5565e 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.c) * - * It has been AutoGen-ed Sunday November 16, 2008 at 07:02:22 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:52:07 AM EST * From the definitions ntp-keygen-opts.def * and the template file options * @@ -770,7 +770,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p142\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p143\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index e7d88cea5..894c7b7b1 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntp-keygen-opts.h) * - * It has been AutoGen-ed Sunday November 16, 2008 at 07:02:21 AM EST + * It has been AutoGen-ed Monday November 17, 2008 at 06:52:06 AM EST * From the definitions ntp-keygen-opts.def * and the template file options * @@ -78,8 +78,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 23 -#define NTP_KEYGEN_VERSION "4.2.5p142" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p142" +#define NTP_KEYGEN_VERSION "4.2.5p143" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.5p143" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index 76e57facc..8b2df1efe 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 Sunday November 16, 2008 at 07:02:24 AM EST +# It has been AutoGen-ed Monday November 17, 2008 at 06:52:09 AM EST # 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 cb209a129..a39093fd1 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2008-11-16 "(ntp 4.2.5p142)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2008-11-17 "(ntp 4.2.5p143)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Sunday November 16, 2008 at 07:02:23 AM EST +.\" It has been AutoGen-ed Monday November 17, 2008 at 06:52:08 AM EST .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"