From: Harlan Stenn Date: Mon, 3 May 2010 10:15:58 +0000 (+0000) Subject: NTP_4_2_7P28 X-Git-Tag: NTP_4_2_7P28^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f1508cf3e0fc11c8a631876f5f3fe7b84f102734;p=thirdparty%2Fntp.git NTP_4_2_7P28 bk: 4bdea25eXqRU-bzf1LAdB3h15qL3-A --- diff --git a/ChangeLog b/ChangeLog index b721debed..9f35bee2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p28) 2010/05/03 Released by Harlan Stenn * Include (4.2.6p2-RC3) [Bug 1512] ntpsnmpd should connect to net-snmpd via a unix-domain socket by default. Provide a command-line 'socket name' option. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index eb1ff75a0..c4800ad30 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 April 27, 2010 at 10:06:52 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:11:03 AM by AutoGen 5.10 * From the definitions ntpd-opts.def * and the template file options * @@ -956,7 +956,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.7p27\n\ +"ntpd - NTP daemon program - Ver. 4.2.7p28\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; #define zRcName NULL #define apzHomeList NULL diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 9f8317b0a..c6c75d414 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 April 27, 2010 at 10:06:51 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:11:03 AM by AutoGen 5.10 * From the definitions ntpd-opts.def * and the template file options * @@ -90,8 +90,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 35 -#define NTPD_VERSION "4.2.7p27" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p27" +#define NTPD_VERSION "4.2.7p28" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.7p28" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 34ca8054f..b1325977f 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 April 27, 2010 at 10:07:09 AM by AutoGen 5.10 +# It has been AutoGen-ed May 3, 2010 at 10:11:50 AM by AutoGen 5.10 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -63,7 +63,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p27 +ntpd - NTP daemon program - Ver. 4.2.7p28 USAGE: ntpd [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1 index 441f627bd..eb51ccd2e 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2010-04-27 "( 4.2.7p27)" "Programmer's Manual" +.TH NTPD 1 2010-05-03 "( 4.2.7p28)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpd.1) .\" -.\" It has been AutoGen-ed April 27, 2010 at 10:07:09 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 3, 2010 at 10:11:50 AM by AutoGen 5.10 .\" 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 7635b315b..f2552fe20 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 April 27, 2010 at 10:07:15 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:12:05 AM by AutoGen 5.10 * From the definitions ntpdc-opts.def * and the template file options * @@ -452,7 +452,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p27\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.7p28\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 6d5df301f..40b6dc727 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 April 27, 2010 at 10:07:15 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:12:04 AM by AutoGen 5.10 * 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.7p27" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p27" +#define NTPDC_VERSION "4.2.7p28" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.7p28" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 70a888827..7be006e49 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 April 27, 2010 at 10:07:24 AM by AutoGen 5.10 +# It has been AutoGen-ed May 3, 2010 at 10:12:26 AM by AutoGen 5.10 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -58,7 +58,7 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTP query program - Ver. 4.2.7p27 +ntpdc - vendor-specific NTP query program - Ver. 4.2.7p28 USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1 index 29f0a3e57..053b76637 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2010-04-27 "( 4.2.7p27)" "Programmer's Manual" +.TH NTPDC 1 2010-05-03 "( 4.2.7p28)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpdc.1) .\" -.\" It has been AutoGen-ed April 27, 2010 at 10:07:24 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 3, 2010 at 10:12:26 AM by AutoGen 5.10 .\" 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 e806aed27..1527fae3c 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 April 27, 2010 at 10:07:24 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:12:27 AM by AutoGen 5.10 * From the definitions ntpq-opts.def * and the template file options * @@ -427,7 +427,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.7p27\n\ +"ntpq - standard NTP query program - Ver. 4.2.7p28\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 3647d9946..544e64a27 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 April 27, 2010 at 10:07:24 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:12:27 AM by AutoGen 5.10 * From the definitions ntpq-opts.def * and the template file options * @@ -69,8 +69,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 14 -#define NTPQ_VERSION "4.2.7p27" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p27" +#define NTPQ_VERSION "4.2.7p28" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.7p28" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index f635584bd..0c1399532 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 April 27, 2010 at 10:07:35 AM by AutoGen 5.10 +# It has been AutoGen-ed May 3, 2010 at 10:12:51 AM by AutoGen 5.10 # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -47,7 +47,7 @@ This is the automatically generated usage text for ntpq: @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.7p27 +ntpq - standard NTP query program - Ver. 4.2.7p28 USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index 3e27f181c..bc8b870a5 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2010-04-27 "( 4.2.7p27)" "Programmer's Manual" +.TH NTPQ 1 2010-05-03 "( 4.2.7p28)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpq.1) .\" -.\" It has been AutoGen-ed April 27, 2010 at 10:07:35 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 3, 2010 at 10:12:51 AM by AutoGen 5.10 .\" 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 87f382493..ea6a06f3e 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 April 27, 2010 at 10:07:35 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:12:52 AM by AutoGen 5.10 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -75,6 +75,17 @@ tSCC zSyslog_NAME[] = "SYSLOG"; tSCC zSyslog_Name[] = "syslog"; #define SYSLOG_FLAGS (OPTST_DISABLED) +/* + * Agentxsocket option description: + */ +tSCC zAgentxsocketText[] = + "The socket address ntpsnmpd uses to connect to net-snmpd"; +tSCC zAgentxsocket_NAME[] = "AGENTXSOCKET"; +tSCC zAgentxsocket_Name[] = "agentxsocket"; +tSCC zAgentxsocketDefaultArg[] = "unix:/var/agentx/master"; +#define AGENTXSOCKET_FLAGS (OPTST_DISABLED \ + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + /* * Help/More_Help/Version option descriptions: */ @@ -162,6 +173,18 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* desc, NAME, name */ zSyslogText, zSyslog_NAME, zSyslog_Name, /* disablement strs */ NULL, NULL }, + { /* entry idx, value */ 2, VALUE_OPT_AGENTXSOCKET, + /* equiv idx, value */ 2, VALUE_OPT_AGENTXSOCKET, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ AGENTXSOCKET_FLAGS, 0, + /* last opt argumnt */ { zAgentxsocketDefaultArg }, + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, NULL, + /* option proc */ NULL, + /* desc, NAME, name */ zAgentxsocketText, zAgentxsocket_NAME, zAgentxsocket_Name, + /* disablement strs */ NULL, NULL }, + { /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION, /* equiv idx value */ NO_EQUIVALENT, 0, /* equivalenced to */ NO_EQUIVALENT, @@ -233,8 +256,8 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPSNMPD"; tSCC zUsageTitle[] = -"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p27\n\ -USAGE: %s [ - | -- ]...\n"; +"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p28\n\ +USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { "$HOME", @@ -285,7 +308,7 @@ tOptions ntpsnmpdOptions = { NO_EQUIVALENT, /* '-#' option index */ NO_EQUIVALENT /* index of default opt */ }, - 7 /* full option count */, 2 /* user option count */, + 8 /* full option count */, 3 /* user option count */, ntpsnmpd_full_usage, ntpsnmpd_short_usage, NULL, NULL }; diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h index bd5232706..2814568db 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 April 27, 2010 at 10:07:35 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:12:52 AM by AutoGen 5.10 * From the definitions ntpsnmpd-opts.def * and the template file options * @@ -52,18 +52,19 @@ * Enumeration of each option: */ typedef enum { - INDEX_OPT_NOFORK = 0, - INDEX_OPT_SYSLOG = 1, - INDEX_OPT_VERSION = 2, - INDEX_OPT_HELP = 3, - INDEX_OPT_MORE_HELP = 4, - INDEX_OPT_SAVE_OPTS = 5, - INDEX_OPT_LOAD_OPTS = 6 + INDEX_OPT_NOFORK = 0, + INDEX_OPT_SYSLOG = 1, + INDEX_OPT_AGENTXSOCKET = 2, + INDEX_OPT_VERSION = 3, + INDEX_OPT_HELP = 4, + INDEX_OPT_MORE_HELP = 5, + INDEX_OPT_SAVE_OPTS = 6, + INDEX_OPT_LOAD_OPTS = 7 } teOptIndex; -#define OPTION_CT 7 -#define NTPSNMPD_VERSION "4.2.7p27" -#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p27" +#define OPTION_CT 8 +#define NTPSNMPD_VERSION "4.2.7p28" +#define NTPSNMPD_FULL_VERSION "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p28" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -98,9 +99,14 @@ typedef enum { # warning undefining SYSLOG due to option name conflict # undef SYSLOG # endif +# ifdef AGENTXSOCKET +# warning undefining AGENTXSOCKET due to option name conflict +# undef AGENTXSOCKET +# endif #else /* NO_OPTION_NAME_WARNINGS */ # undef NOFORK # undef SYSLOG +# undef AGENTXSOCKET #endif /* NO_OPTION_NAME_WARNINGS */ /* * * * * * @@ -109,6 +115,7 @@ typedef enum { */ #define VALUE_OPT_NOFORK 'n' #define VALUE_OPT_SYSLOG 'p' +#define VALUE_OPT_AGENTXSOCKET 2 #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' #define VALUE_OPT_VERSION INDEX_OPT_VERSION diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi index c067d2a32..30904c631 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 April 27, 2010 at 10:07:36 AM by AutoGen 5.10 +# It has been AutoGen-ed May 3, 2010 at 10:12:54 AM by AutoGen 5.10 # From the definitions ntpsnmpd-opts.def # and the template file aginfo.tpl @end ignore @@ -21,6 +21,7 @@ This software is released under a specialized copyright license. @menu * ntpsnmpd usage:: ntpsnmpd usage help (-?) +* ntpsnmpd agentxsocket:: agentxsocket option * ntpsnmpd nofork:: nofork option (-n) * ntpsnmpd syslog:: syslog option (-p) @end menu @@ -50,3 +51,11 @@ This is the ``do not fork'' option. This is the ``log to syslog()'' option. + +@node ntpsnmpd agentxsocket +@subsection agentxsocket option +@cindex ntpsnmpd-agentxsocket + +This is the ``the socket address ntpsnmpd uses to connect to net-snmpd'' option. +[:] +The default is the Unix Domain socket "unix:/var/agentx/master". Another common alternative is tcp:localhost:705. diff --git a/ntpsnmpd/ntpsnmpd.1 b/ntpsnmpd/ntpsnmpd.1 index 207b8c1df..caedd136a 100644 --- a/ntpsnmpd/ntpsnmpd.1 +++ b/ntpsnmpd/ntpsnmpd.1 @@ -1,7 +1,7 @@ -.TH NTPSNMPD 1 2010-04-27 "( 4.2.7p27)" "Programmer's Manual" +.TH NTPSNMPD 1 2010-05-03 "( 4.2.7p28)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntpsnmpd.1) .\" -.\" It has been AutoGen-ed April 27, 2010 at 10:07:36 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 3, 2010 at 10:12:53 AM by AutoGen 5.10 .\" From the definitions ntpsnmpd-opts.def .\" and the template file agman1.tpl .\" @@ -27,6 +27,15 @@ Do not fork. Log to syslog(). .sp +.TP +.BR \--agentxsocket "=\fIstring\fP" +The socket address ntpsnmpd uses to connect to net-snmpd. +The default \fIstring\fP for this option is: +.ti +4 + unix:/var/agentx/master +.sp +[:] +The default is the Unix Domain socket "unix:/var/agentx/master". Another common alternative is tcp:localhost:705. .TP .BR \-? , " \--help" Display extended usage information and exit. diff --git a/packageinfo.sh b/packageinfo.sh index e12577d93..272fd9c66 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=27 +point=28 ### betapoint is normally modified by script. # ntp-stable Beta number (betapoint) diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index b487c3161..ec801bdb5 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 April 27, 2010 at 10:08:37 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:15:24 AM by AutoGen 5.10 * From the definitions sntp-opts.def * and the template file options * @@ -474,7 +474,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.7p27\n\ +"sntp - standard SNTP program - Ver. 4.2.7p28\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 40fe55344..f3c4c3f35 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 April 27, 2010 at 10:08:37 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:15:24 AM by AutoGen 5.10 * From the definitions sntp-opts.def * and the template file options * @@ -72,8 +72,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 17 -#define SNTP_VERSION "4.2.7p27" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p27" +#define SNTP_VERSION "4.2.7p28" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.7p28" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index cfc9bd0df..151306437 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 April 27, 2010 at 10:08:41 AM by AutoGen 5.10 +# It has been AutoGen-ed May 3, 2010 at 10:15:31 AM by AutoGen 5.10 # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore @@ -56,7 +56,7 @@ This is the automatically generated usage text for sntp: @exampleindent 0 @example -sntp - standard SNTP program - Ver. 4.2.7p27 +sntp - standard SNTP program - Ver. 4.2.7p28 USAGE: sntp [ - [] | --[@{=| @}] ]... hostname-or-IP ... Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/sntp/sntp.1 b/sntp/sntp.1 index 13b7ad48c..2a7d1214e 100644 --- a/sntp/sntp.1 +++ b/sntp/sntp.1 @@ -1,7 +1,7 @@ -.TH SNTP 1 2010-04-27 "( 4.2.7p27)" "Programmer's Manual" +.TH SNTP 1 2010-05-03 "( 4.2.7p28)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (sntp.1) .\" -.\" It has been AutoGen-ed April 27, 2010 at 10:08:41 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 3, 2010 at 10:15:31 AM by AutoGen 5.10 .\" From the definitions sntp-opts.def .\" and the template file agman1.tpl .\" diff --git a/sntp/sntp.html b/sntp/sntp.html index 357b055d5..b999c7a2d 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.7p27 of sntp. +

This document applies to version 4.2.7p28 of sntp.

The program implements the SNTP protocol as defined by the draft NTPv4 IETF specification. diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index df2c984c3..d214fb6bd 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 April 27, 2010 at 10:08:42 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:15:32 AM by AutoGen 5.10 * From the definitions ntp-keygen-opts.def * and the template file options * @@ -738,7 +738,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p27\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p28\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index de2065a72..bc9c6ac72 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 April 27, 2010 at 10:08:42 AM by AutoGen 5.10 + * It has been AutoGen-ed May 3, 2010 at 10:15:32 AM by AutoGen 5.10 * 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.7p27" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p27" +#define NTP_KEYGEN_VERSION "4.2.7p28" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p28" /* * 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 858163e5a..654fc116b 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 April 27, 2010 at 10:08:47 AM by AutoGen 5.10 +# It has been AutoGen-ed May 3, 2010 at 10:15:42 AM by AutoGen 5.10 # From the definitions ntp-keygen-opts.def # and the template file aginfo.tpl @end ignore @@ -51,7 +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.7p27 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p28 USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -c Str certificate certificate scheme diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1 index 59ed425bd..55945638f 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2010-04-27 "(ntp 4.2.7p27)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2010-05-03 "(ntp 4.2.7p28)" "Programmer's Manual" .\" EDIT THIS FILE WITH CAUTION (ntp-keygen.1) .\" -.\" It has been AutoGen-ed April 27, 2010 at 10:08:47 AM by AutoGen 5.10 +.\" It has been AutoGen-ed May 3, 2010 at 10:15:42 AM by AutoGen 5.10 .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"