From: Harlan Stenn Date: Fri, 8 Sep 2006 01:45:01 +0000 (-0400) Subject: NTP_4_2_3P39 X-Git-Tag: NTP_4_2_3P39^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1653d3d9613fa99bd7bd318c8d3a3416e8fe63f5;p=thirdparty%2Fntp.git NTP_4_2_3P39 bk: 4500cb1dVgoStV_bxmW23DOedCZdqQ --- diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 814b5458e..70a18d92a 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpd-opts.c) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:42:51 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:31:51 PM EDT * From the definitions ntpd-opts.def * and the template file options */ @@ -864,7 +864,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.3p38\n\ +"ntpd - NTP daemon program - Ver. 4.2.3p39\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 3ea75490b..d9f20bbac 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpd-opts.h) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:42:50 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:31:51 PM EDT * From the definitions ntpd-opts.def * and the template file options */ @@ -88,8 +88,189 @@ typedef enum { } teOptIndex; #define OPTION_CT 34 -#define NTPD_VERSION "4.2.3p38" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.3p38" +#define NTPD_VERSION "4.2.3p39" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.3p39" + +/* + * Make sure there are no #define name conflicts with the option names + */ +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef IPV4 +# warn undefining IPV4 due to option name conflict +# undef IPV4 +# endif + +# ifdef IPV6 +# warn undefining IPV6 due to option name conflict +# undef IPV6 +# endif + +# ifdef AUTHREQ +# warn undefining AUTHREQ due to option name conflict +# undef AUTHREQ +# endif + +# ifdef AUTHNOREQ +# warn undefining AUTHNOREQ due to option name conflict +# undef AUTHNOREQ +# endif + +# ifdef BCASTSYNC +# warn undefining BCASTSYNC due to option name conflict +# undef BCASTSYNC +# endif + +# ifdef CONFIGFILE +# warn undefining CONFIGFILE due to option name conflict +# undef CONFIGFILE +# endif + +# ifdef DEBUG_LEVEL +# warn undefining DEBUG_LEVEL due to option name conflict +# undef DEBUG_LEVEL +# endif + +# ifdef SET_DEBUG_LEVEL +# warn undefining SET_DEBUG_LEVEL due to option name conflict +# undef SET_DEBUG_LEVEL +# endif + +# ifdef DRIFTFILE +# warn undefining DRIFTFILE due to option name conflict +# undef DRIFTFILE +# endif + +# ifdef PANICGATE +# warn undefining PANICGATE due to option name conflict +# undef PANICGATE +# endif + +# ifdef JAILDIR +# warn undefining JAILDIR due to option name conflict +# undef JAILDIR +# endif + +# ifdef INTERFACE +# warn undefining INTERFACE due to option name conflict +# undef INTERFACE +# endif + +# ifdef KEYFILE +# warn undefining KEYFILE due to option name conflict +# undef KEYFILE +# endif + +# ifdef LOGFILE +# warn undefining LOGFILE due to option name conflict +# undef LOGFILE +# endif + +# ifdef NOVIRTUALIPS +# warn undefining NOVIRTUALIPS due to option name conflict +# undef NOVIRTUALIPS +# endif + +# ifdef MODIFYMMTIMER +# warn undefining MODIFYMMTIMER due to option name conflict +# undef MODIFYMMTIMER +# endif + +# ifdef NOFORK +# warn undefining NOFORK due to option name conflict +# undef NOFORK +# endif + +# ifdef NICE +# warn undefining NICE due to option name conflict +# undef NICE +# endif + +# ifdef PIDFILE +# warn undefining PIDFILE due to option name conflict +# undef PIDFILE +# endif + +# ifdef PRIORITY +# warn undefining PRIORITY due to option name conflict +# undef PRIORITY +# endif + +# ifdef QUIT +# warn undefining QUIT due to option name conflict +# undef QUIT +# endif + +# ifdef PROPAGATIONDELAY +# warn undefining PROPAGATIONDELAY due to option name conflict +# undef PROPAGATIONDELAY +# endif + +# ifdef UPDATEINTERVAL +# warn undefining UPDATEINTERVAL due to option name conflict +# undef UPDATEINTERVAL +# endif + +# ifdef STATSDIR +# warn undefining STATSDIR due to option name conflict +# undef STATSDIR +# endif + +# ifdef TRUSTEDKEY +# warn undefining TRUSTEDKEY due to option name conflict +# undef TRUSTEDKEY +# endif + +# ifdef USER +# warn undefining USER due to option name conflict +# undef USER +# endif + +# ifdef VAR +# warn undefining VAR due to option name conflict +# undef VAR +# endif + +# ifdef DVAR +# warn undefining DVAR due to option name conflict +# undef DVAR +# endif + +# ifdef SLEW +# warn undefining SLEW due to option name conflict +# undef SLEW +# endif + +#else /* NO_OPTION_NAME_WARNINGS */ +# undef IPV4 +# undef IPV6 +# undef AUTHREQ +# undef AUTHNOREQ +# undef BCASTSYNC +# undef CONFIGFILE +# undef DEBUG_LEVEL +# undef SET_DEBUG_LEVEL +# undef DRIFTFILE +# undef PANICGATE +# undef JAILDIR +# undef INTERFACE +# undef KEYFILE +# undef LOGFILE +# undef NOVIRTUALIPS +# undef MODIFYMMTIMER +# undef NOFORK +# undef NICE +# undef PIDFILE +# undef PRIORITY +# undef QUIT +# undef PROPAGATIONDELAY +# undef UPDATEINTERVAL +# undef STATSDIR +# undef TRUSTEDKEY +# undef USER +# undef VAR +# undef DVAR +# undef SLEW +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for all options. Replace "n" with @@ -174,7 +355,7 @@ typedef enum { ntpdOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdOptions.pUsageProc)( &ntpdOptions, c ) -/* extracted from opthead near line 288 */ +/* extracted from opthead near line 316 */ /* * * * * * * diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index af2532b76..089c8326c 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpd-opts.texi) # -# It has been AutoGen-ed Thursday August 31, 2006 at 01:42:53 AM EDT +# It has been AutoGen-ed Thursday September 7, 2006 at 09:31:54 PM EDT # 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 bb588b2bb..6527a19e3 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2006-08-31 "( 4.2.3p38)" "Programmer's Manual" +.TH NTPD 1 2006-09-07 "( 4.2.3p39)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpd.1) .\" -.\" It has been AutoGen-ed Thursday August 31, 2006 at 01:42:52 AM EDT +.\" It has been AutoGen-ed Thursday September 7, 2006 at 09:31:53 PM EDT .\" From the definitions ntpd-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c index f8b89230a..31b10cff3 100644 --- a/ntpd/ntpdsim-opts.c +++ b/ntpd/ntpdsim-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpdsim-opts.c) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:42:55 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:31:56 PM EDT * From the definitions ntpdsim-opts.def * and the template file options */ @@ -1062,7 +1062,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDSIM"; tSCC zUsageTitle[] = -"ntpdsim - NTP daemon simulation program - Ver. 4.2.3p38\n\ +"ntpdsim - NTP daemon simulation program - Ver. 4.2.3p39\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index 6bd2a90aa..5bcbc9c54 100644 --- a/ntpd/ntpdsim-opts.h +++ b/ntpd/ntpdsim-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpdsim-opts.h) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:42:54 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:31:55 PM EDT * From the definitions ntpdsim-opts.def * and the template file options */ @@ -97,8 +97,243 @@ typedef enum { } teOptIndex; #define OPTION_CT 43 -#define NTPDSIM_VERSION "4.2.3p38" -#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.3p38" +#define NTPDSIM_VERSION "4.2.3p39" +#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.3p39" + +/* + * Make sure there are no #define name conflicts with the option names + */ +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef IPV4 +# warn undefining IPV4 due to option name conflict +# undef IPV4 +# endif + +# ifdef IPV6 +# warn undefining IPV6 due to option name conflict +# undef IPV6 +# endif + +# ifdef AUTHREQ +# warn undefining AUTHREQ due to option name conflict +# undef AUTHREQ +# endif + +# ifdef AUTHNOREQ +# warn undefining AUTHNOREQ due to option name conflict +# undef AUTHNOREQ +# endif + +# ifdef BCASTSYNC +# warn undefining BCASTSYNC due to option name conflict +# undef BCASTSYNC +# endif + +# ifdef SIMBROADCASTDELAY +# warn undefining SIMBROADCASTDELAY due to option name conflict +# undef SIMBROADCASTDELAY +# endif + +# ifdef CONFIGFILE +# warn undefining CONFIGFILE due to option name conflict +# undef CONFIGFILE +# endif + +# ifdef PHASENOISE +# warn undefining PHASENOISE due to option name conflict +# undef PHASENOISE +# endif + +# ifdef DEBUG_LEVEL +# warn undefining DEBUG_LEVEL due to option name conflict +# undef DEBUG_LEVEL +# endif + +# ifdef SET_DEBUG_LEVEL +# warn undefining SET_DEBUG_LEVEL due to option name conflict +# undef SET_DEBUG_LEVEL +# endif + +# ifdef DRIFTFILE +# warn undefining DRIFTFILE due to option name conflict +# undef DRIFTFILE +# endif + +# ifdef PANICGATE +# warn undefining PANICGATE due to option name conflict +# undef PANICGATE +# endif + +# ifdef SIMSLEW +# warn undefining SIMSLEW due to option name conflict +# undef SIMSLEW +# endif + +# ifdef JAILDIR +# warn undefining JAILDIR due to option name conflict +# undef JAILDIR +# endif + +# ifdef INTERFACE +# warn undefining INTERFACE due to option name conflict +# undef INTERFACE +# endif + +# ifdef KEYFILE +# warn undefining KEYFILE due to option name conflict +# undef KEYFILE +# endif + +# ifdef LOGFILE +# warn undefining LOGFILE due to option name conflict +# undef LOGFILE +# endif + +# ifdef NOVIRTUALIPS +# warn undefining NOVIRTUALIPS due to option name conflict +# undef NOVIRTUALIPS +# endif + +# ifdef MODIFYMMTIMER +# warn undefining MODIFYMMTIMER due to option name conflict +# undef MODIFYMMTIMER +# endif + +# ifdef NOFORK +# warn undefining NOFORK due to option name conflict +# undef NOFORK +# endif + +# ifdef NICE +# warn undefining NICE due to option name conflict +# undef NICE +# endif + +# ifdef SERVERTIME +# warn undefining SERVERTIME due to option name conflict +# undef SERVERTIME +# endif + +# ifdef PIDFILE +# warn undefining PIDFILE due to option name conflict +# undef PIDFILE +# endif + +# ifdef PRIORITY +# warn undefining PRIORITY due to option name conflict +# undef PRIORITY +# endif + +# ifdef QUIT +# warn undefining QUIT due to option name conflict +# undef QUIT +# endif + +# ifdef PROPAGATIONDELAY +# warn undefining PROPAGATIONDELAY due to option name conflict +# undef PROPAGATIONDELAY +# endif + +# ifdef UPDATEINTERVAL +# warn undefining UPDATEINTERVAL due to option name conflict +# undef UPDATEINTERVAL +# endif + +# ifdef STATSDIR +# warn undefining STATSDIR due to option name conflict +# undef STATSDIR +# endif + +# ifdef ENDSIMTIME +# warn undefining ENDSIMTIME due to option name conflict +# undef ENDSIMTIME +# endif + +# ifdef TRUSTEDKEY +# warn undefining TRUSTEDKEY due to option name conflict +# undef TRUSTEDKEY +# endif + +# ifdef FREQERR +# warn undefining FREQERR due to option name conflict +# undef FREQERR +# endif + +# ifdef WALKNOISE +# warn undefining WALKNOISE due to option name conflict +# undef WALKNOISE +# endif + +# ifdef USER +# warn undefining USER due to option name conflict +# undef USER +# endif + +# ifdef VAR +# warn undefining VAR due to option name conflict +# undef VAR +# endif + +# ifdef DVAR +# warn undefining DVAR due to option name conflict +# undef DVAR +# endif + +# ifdef SLEW +# warn undefining SLEW due to option name conflict +# undef SLEW +# endif + +# ifdef NDELAY +# warn undefining NDELAY due to option name conflict +# undef NDELAY +# endif + +# ifdef PDELAY +# warn undefining PDELAY due to option name conflict +# undef PDELAY +# endif + +#else /* NO_OPTION_NAME_WARNINGS */ +# undef IPV4 +# undef IPV6 +# undef AUTHREQ +# undef AUTHNOREQ +# undef BCASTSYNC +# undef SIMBROADCASTDELAY +# undef CONFIGFILE +# undef PHASENOISE +# undef DEBUG_LEVEL +# undef SET_DEBUG_LEVEL +# undef DRIFTFILE +# undef PANICGATE +# undef SIMSLEW +# undef JAILDIR +# undef INTERFACE +# undef KEYFILE +# undef LOGFILE +# undef NOVIRTUALIPS +# undef MODIFYMMTIMER +# undef NOFORK +# undef NICE +# undef SERVERTIME +# undef PIDFILE +# undef PRIORITY +# undef QUIT +# undef PROPAGATIONDELAY +# undef UPDATEINTERVAL +# undef STATSDIR +# undef ENDSIMTIME +# undef TRUSTEDKEY +# undef FREQERR +# undef WALKNOISE +# undef USER +# undef VAR +# undef DVAR +# undef SLEW +# undef NDELAY +# undef PDELAY +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for all options. Replace "n" with @@ -192,7 +427,7 @@ typedef enum { ntpdsimOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdsimOptions.pUsageProc)( &ntpdsimOptions, c ) -/* extracted from opthead near line 288 */ +/* extracted from opthead near line 316 */ /* * * * * * * diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi index 9693920b4..a0a0960fd 100644 --- a/ntpd/ntpdsim-opts.texi +++ b/ntpd/ntpdsim-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpdsim-opts.texi) # -# It has been AutoGen-ed Thursday August 31, 2006 at 01:42:58 AM EDT +# It has been AutoGen-ed Thursday September 7, 2006 at 09:31:59 PM EDT # From the definitions ntpdsim-opts.def # and the template file aginfo.tpl @end ignore diff --git a/ntpd/ntpdsim.1 b/ntpd/ntpdsim.1 index 980b6665e..dfbac9dc2 100644 --- a/ntpd/ntpdsim.1 +++ b/ntpd/ntpdsim.1 @@ -1,7 +1,7 @@ -.TH NTPDSIM 1 2006-08-31 "( 4.2.3p38)" "Programmer's Manual" +.TH NTPDSIM 1 2006-09-07 "( 4.2.3p39)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpdsim.1) .\" -.\" It has been AutoGen-ed Thursday August 31, 2006 at 01:42:57 AM EDT +.\" It has been AutoGen-ed Thursday September 7, 2006 at 09:31:58 PM EDT .\" From the definitions ntpdsim-opts.def .\" and the template file agman1.tpl .\" diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index 3ecc82b5a..5e98bca47 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpdc-opts.c) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:49:06 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:33:14 PM EDT * From the definitions ntpdc-opts.def * and the template file options */ @@ -451,7 +451,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.3p38\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.3p39\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 616e4829a..41fa89615 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpdc-opts.h) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:49:06 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:33:14 PM EDT * From the definitions ntpdc-opts.def * and the template file options */ @@ -69,8 +69,75 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.3p38" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.3p38" +#define NTPDC_VERSION "4.2.3p39" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.3p39" + +/* + * Make sure there are no #define name conflicts with the option names + */ +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef IPV4 +# warn undefining IPV4 due to option name conflict +# undef IPV4 +# endif + +# ifdef IPV6 +# warn undefining IPV6 due to option name conflict +# undef IPV6 +# endif + +# ifdef COMMAND +# warn undefining COMMAND due to option name conflict +# undef COMMAND +# endif + +# ifdef LISTPEERS +# warn undefining LISTPEERS due to option name conflict +# undef LISTPEERS +# endif + +# ifdef PEERS +# warn undefining PEERS due to option name conflict +# undef PEERS +# endif + +# ifdef SHOWPEERS +# warn undefining SHOWPEERS due to option name conflict +# undef SHOWPEERS +# endif + +# ifdef INTERACTIVE +# warn undefining INTERACTIVE due to option name conflict +# undef INTERACTIVE +# endif + +# ifdef DEBUG_LEVEL +# warn undefining DEBUG_LEVEL due to option name conflict +# undef DEBUG_LEVEL +# endif + +# ifdef SET_DEBUG_LEVEL +# warn undefining SET_DEBUG_LEVEL due to option name conflict +# undef SET_DEBUG_LEVEL +# endif + +# ifdef NUMERIC +# warn undefining NUMERIC due to option name conflict +# undef NUMERIC +# endif + +#else /* NO_OPTION_NAME_WARNINGS */ +# undef IPV4 +# undef IPV6 +# undef COMMAND +# undef LISTPEERS +# undef PEERS +# undef SHOWPEERS +# undef INTERACTIVE +# undef DEBUG_LEVEL +# undef SET_DEBUG_LEVEL +# undef NUMERIC +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for all options. Replace "n" with @@ -132,7 +199,7 @@ typedef enum { ntpdcOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdcOptions.pUsageProc)( &ntpdcOptions, c ) -/* extracted from opthead near line 288 */ +/* extracted from opthead near line 316 */ /* * * * * * * diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 8fa7125f3..3295c0b99 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpdc-opts.texi) # -# It has been AutoGen-ed Thursday August 31, 2006 at 01:49:08 AM EDT +# It has been AutoGen-ed Thursday September 7, 2006 at 09:33:16 PM EDT # 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 610e0d5fe..7653d2759 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2006-08-31 "( 4.2.3p38)" "Programmer's Manual" +.TH NTPDC 1 2006-09-07 "( 4.2.3p39)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpdc.1) .\" -.\" It has been AutoGen-ed Thursday August 31, 2006 at 01:49:08 AM EDT +.\" It has been AutoGen-ed Thursday September 7, 2006 at 09:33:16 PM EDT .\" 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 416fd8690..0d9edecaf 100644 --- a/ntpq/ntpq-opts.c +++ b/ntpq/ntpq-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpq-opts.c) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:49:37 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:33:33 PM EDT * From the definitions ntpq-opts.def * and the template file options */ @@ -399,7 +399,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.3p38\n\ +"ntpq - standard NTP query program - Ver. 4.2.3p39\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 26ad38b91..e93f90b4d 100644 --- a/ntpq/ntpq-opts.h +++ b/ntpq/ntpq-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntpq-opts.h) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:49:36 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:33:33 PM EDT * From the definitions ntpq-opts.def * and the template file options */ @@ -67,8 +67,63 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define NTPQ_VERSION "4.2.3p38" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.3p38" +#define NTPQ_VERSION "4.2.3p39" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.3p39" + +/* + * Make sure there are no #define name conflicts with the option names + */ +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef IPV4 +# warn undefining IPV4 due to option name conflict +# undef IPV4 +# endif + +# ifdef IPV6 +# warn undefining IPV6 due to option name conflict +# undef IPV6 +# endif + +# ifdef COMMAND +# warn undefining COMMAND due to option name conflict +# undef COMMAND +# endif + +# ifdef DEBUG_LEVEL +# warn undefining DEBUG_LEVEL due to option name conflict +# undef DEBUG_LEVEL +# endif + +# ifdef SET_DEBUG_LEVEL +# warn undefining SET_DEBUG_LEVEL due to option name conflict +# undef SET_DEBUG_LEVEL +# endif + +# ifdef PEERS +# warn undefining PEERS due to option name conflict +# undef PEERS +# endif + +# ifdef INTERACTIVE +# warn undefining INTERACTIVE due to option name conflict +# undef INTERACTIVE +# endif + +# ifdef NUMERIC +# warn undefining NUMERIC due to option name conflict +# undef NUMERIC +# endif + +#else /* NO_OPTION_NAME_WARNINGS */ +# undef IPV4 +# undef IPV6 +# undef COMMAND +# undef DEBUG_LEVEL +# undef SET_DEBUG_LEVEL +# undef PEERS +# undef INTERACTIVE +# undef NUMERIC +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for all options. Replace "n" with @@ -128,7 +183,7 @@ typedef enum { ntpqOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpqOptions.pUsageProc)( &ntpqOptions, c ) -/* extracted from opthead near line 288 */ +/* extracted from opthead near line 316 */ /* * * * * * * diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index be403b4d6..d9bf96824 100644 --- a/ntpq/ntpq-opts.texi +++ b/ntpq/ntpq-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntpq-opts.texi) # -# It has been AutoGen-ed Thursday August 31, 2006 at 01:49:39 AM EDT +# It has been AutoGen-ed Thursday September 7, 2006 at 09:33:35 PM EDT # 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 a0939bea0..f8a9fa28f 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2006-08-31 "( 4.2.3p38)" "Programmer's Manual" +.TH NTPQ 1 2006-09-07 "( 4.2.3p39)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpq.1) .\" -.\" It has been AutoGen-ed Thursday August 31, 2006 at 01:49:38 AM EDT +.\" It has been AutoGen-ed Thursday September 7, 2006 at 09:33:34 PM EDT .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index b81dd7269..1a290579d 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=38 +point=39 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index c6cc4ed4d..318e7df26 100644 --- a/sntp/sntp-opts.c +++ b/sntp/sntp-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (sntp-opts.c) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:50:08 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:20:54 PM EDT * From the definitions sntp-opts.def * and the template file options */ @@ -114,7 +114,7 @@ tSCC zCopyright[] = "sntp copyright (c) 1970-2006 ntp.org, all rights reserved"; tSCC zCopyrightNotice[] = -/* extracted from sntp-opts.def near line 10 */ +/* extracted from sntp-opts.def near line 12 */ " General Public Licence for the software known as MSNTP\n\ ------------------------------------------------------\n\n\ \t (c) Copyright, N.M. Maclaren, 1996, 1997, 2000\n\ @@ -481,7 +481,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.3p38\n\ +"sntp - standard SNTP program - Ver. 4.2.3p39\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 56a1395de..00d6677dc 100644 --- a/sntp/sntp-opts.h +++ b/sntp/sntp-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (sntp-opts.h) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:50:07 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:20:53 PM EDT * From the definitions sntp-opts.def * and the template file options */ @@ -145,8 +145,57 @@ typedef enum { } teOptIndex; #define OPTION_CT 12 -#define SNTP_VERSION "4.2.3p38" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.3p38" +#define SNTP_VERSION "4.2.3p39" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.3p39" + +/* + * Make sure there are no #define name conflicts with the option names + */ +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef IPV4 +# warn undefining IPV4 due to option name conflict +# undef IPV4 +# endif + +# ifdef IPV6 +# warn undefining IPV6 due to option name conflict +# undef IPV6 +# endif + +# ifdef NORMALVERBOSE +# warn undefining NORMALVERBOSE due to option name conflict +# undef NORMALVERBOSE +# endif + +# ifdef EXTRAVERBOSE +# warn undefining EXTRAVERBOSE due to option name conflict +# undef EXTRAVERBOSE +# endif + +# ifdef MEGAVERBOSE +# warn undefining MEGAVERBOSE due to option name conflict +# undef MEGAVERBOSE +# endif + +# ifdef SETTIMEOFDAY +# warn undefining SETTIMEOFDAY due to option name conflict +# undef SETTIMEOFDAY +# endif + +# ifdef ADJTIME +# warn undefining ADJTIME due to option name conflict +# undef ADJTIME +# endif + +#else /* NO_OPTION_NAME_WARNINGS */ +# undef IPV4 +# undef IPV6 +# undef NORMALVERBOSE +# undef EXTRAVERBOSE +# undef MEGAVERBOSE +# undef SETTIMEOFDAY +# undef ADJTIME +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for all options. Replace "n" with @@ -201,7 +250,7 @@ typedef enum { sntpOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*sntpOptions.pUsageProc)( &sntpOptions, c ) -/* extracted from opthead near line 288 */ +/* extracted from opthead near line 316 */ /* * * * * * * diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index e7ba3258d..692915eae 100644 --- a/sntp/sntp-opts.texi +++ b/sntp/sntp-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (sntp-opts.texi) # -# It has been AutoGen-ed Thursday August 31, 2006 at 01:50:10 AM EDT +# It has been AutoGen-ed Thursday September 7, 2006 at 09:20:57 PM EDT # From the definitions sntp-opts.def # and the template file aginfo.tpl @end ignore diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c index 17d9f0384..3728ef60c 100644 --- a/util/ntp-keygen-opts.c +++ b/util/ntp-keygen-opts.c @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntp-keygen-opts.c) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:50:17 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:33:56 PM EDT * From the definitions ntp-keygen-opts.def * and the template file options */ @@ -789,7 +789,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTP_KEYGEN"; tSCC zUsageTitle[] = -"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p38\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p39\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index 80b14ab28..936d48e7c 100644 --- a/util/ntp-keygen-opts.h +++ b/util/ntp-keygen-opts.h @@ -2,7 +2,7 @@ * * DO NOT EDIT THIS FILE (ntp-keygen-opts.h) * - * It has been AutoGen-ed Thursday August 31, 2006 at 01:50:16 AM EDT + * It has been AutoGen-ed Thursday September 7, 2006 at 09:33:55 PM EDT * From the definitions ntp-keygen-opts.def * and the template file options */ @@ -78,8 +78,129 @@ typedef enum { } teOptIndex; #define OPTION_CT 24 -#define NTP_KEYGEN_VERSION "4.2.3p38" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p38" +#define NTP_KEYGEN_VERSION "4.2.3p39" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p39" + +/* + * Make sure there are no #define name conflicts with the option names + */ +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef CERTIFICATE +# warn undefining CERTIFICATE due to option name conflict +# undef CERTIFICATE +# endif + +# ifdef DEBUG_LEVEL +# warn undefining DEBUG_LEVEL due to option name conflict +# undef DEBUG_LEVEL +# endif + +# ifdef SET_DEBUG_LEVEL +# warn undefining SET_DEBUG_LEVEL due to option name conflict +# undef SET_DEBUG_LEVEL +# endif + +# ifdef ID_KEY +# warn undefining ID_KEY due to option name conflict +# undef ID_KEY +# endif + +# ifdef GQ_PARAMS +# warn undefining GQ_PARAMS due to option name conflict +# undef GQ_PARAMS +# endif + +# ifdef GQ_KEYS +# warn undefining GQ_KEYS due to option name conflict +# undef GQ_KEYS +# endif + +# ifdef HOST_KEY +# warn undefining HOST_KEY due to option name conflict +# undef HOST_KEY +# endif + +# ifdef IFFKEY +# warn undefining IFFKEY due to option name conflict +# undef IFFKEY +# endif + +# ifdef ISSUER_NAME +# warn undefining ISSUER_NAME due to option name conflict +# undef ISSUER_NAME +# endif + +# ifdef MD5KEY +# warn undefining MD5KEY due to option name conflict +# undef MD5KEY +# endif + +# ifdef MODULUS +# warn undefining MODULUS due to option name conflict +# undef MODULUS +# endif + +# ifdef PVT_CERT +# warn undefining PVT_CERT due to option name conflict +# undef PVT_CERT +# endif + +# ifdef PVT_PASSWD +# warn undefining PVT_PASSWD due to option name conflict +# undef PVT_PASSWD +# endif + +# ifdef GET_PVT_PASSWD +# warn undefining GET_PVT_PASSWD due to option name conflict +# undef GET_PVT_PASSWD +# endif + +# ifdef SIGN_KEY +# warn undefining SIGN_KEY due to option name conflict +# undef SIGN_KEY +# endif + +# ifdef SUBJECT_NAME +# warn undefining SUBJECT_NAME due to option name conflict +# undef SUBJECT_NAME +# endif + +# ifdef TRUSTED_CERT +# warn undefining TRUSTED_CERT due to option name conflict +# undef TRUSTED_CERT +# endif + +# ifdef MV_PARAMS +# warn undefining MV_PARAMS due to option name conflict +# undef MV_PARAMS +# endif + +# ifdef MV_KEYS +# warn undefining MV_KEYS due to option name conflict +# undef MV_KEYS +# endif + +#else /* NO_OPTION_NAME_WARNINGS */ +# undef CERTIFICATE +# undef DEBUG_LEVEL +# undef SET_DEBUG_LEVEL +# undef ID_KEY +# undef GQ_PARAMS +# undef GQ_KEYS +# undef HOST_KEY +# undef IFFKEY +# undef ISSUER_NAME +# undef MD5KEY +# undef MODULUS +# undef PVT_CERT +# undef PVT_PASSWD +# undef GET_PVT_PASSWD +# undef SIGN_KEY +# undef SUBJECT_NAME +# undef TRUSTED_CERT +# undef MV_PARAMS +# undef MV_KEYS +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for all options. Replace "n" with @@ -183,7 +304,7 @@ typedef enum { ntp_keygenOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntp_keygenOptions.pUsageProc)( &ntp_keygenOptions, c ) -/* extracted from opthead near line 288 */ +/* extracted from opthead near line 316 */ /* * * * * * * diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index 73bf17fed..eb3117c04 100644 --- a/util/ntp-keygen-opts.texi +++ b/util/ntp-keygen-opts.texi @@ -7,7 +7,7 @@ # # DO NOT EDIT THIS FILE (ntp-keygen-opts.texi) # -# It has been AutoGen-ed Thursday August 31, 2006 at 01:50:19 AM EDT +# It has been AutoGen-ed Thursday September 7, 2006 at 09:33:58 PM EDT # 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 d83a55208..27f54091d 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2006-08-31 "(ntp 4.2.3p38)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2006-09-07 "(ntp 4.2.3p39)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Thursday August 31, 2006 at 01:50:19 AM EDT +.\" It has been AutoGen-ed Thursday September 7, 2006 at 09:33:57 PM EDT .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"