From da5b3496e2d6156903b8bf2fb95c54fa1d3fd2cb Mon Sep 17 00:00:00 2001 From: Harlan Stenn Date: Sun, 10 Sep 2006 07:48:06 -0400 Subject: [PATCH] NTP_4_2_3P42 bk: 4503fb76lj0wSr4UphkXooO-egw8Tw --- ntpd/ntpd-opts.c | 4 +- ntpd/ntpd-opts.h | 257 ++++++++++++++---------------- ntpd/ntpd-opts.texi | 2 +- ntpd/ntpd.1 | 4 +- ntpd/ntpdsim-opts.c | 4 +- ntpd/ntpdsim-opts.h | 320 +++++++++++++++++--------------------- ntpd/ntpdsim-opts.texi | 2 +- ntpd/ntpdsim.1 | 4 +- ntpdc/ntpdc-opts.c | 4 +- ntpdc/ntpdc-opts.h | 124 +++++++-------- ntpdc/ntpdc-opts.texi | 2 +- ntpdc/ntpdc.1 | 4 +- ntpq/ntpq-opts.c | 4 +- ntpq/ntpq-opts.h | 110 ++++++------- ntpq/ntpq-opts.texi | 2 +- ntpq/ntpq.1 | 4 +- packageinfo.sh | 2 +- sntp/sntp-opts.c | 4 +- sntp/sntp-opts.h | 103 ++++++------ sntp/sntp-opts.texi | 2 +- util/ntp-keygen-opts.c | 4 +- util/ntp-keygen-opts.h | 187 ++++++++++------------ util/ntp-keygen-opts.texi | 2 +- util/ntp-keygen.1 | 4 +- 24 files changed, 524 insertions(+), 635 deletions(-) diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index e80c7dfa8..f5129676f 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 Saturday September 9, 2006 at 05:11:04 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:38:45 AM 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.3p41\n\ +"ntpd - NTP daemon program - Ver. 4.2.3p42\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 88068f2ca..ceb6268cd 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 Saturday September 9, 2006 at 05:11:03 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:38:44 AM EDT * From the definitions ntpd-opts.def * and the template file options */ @@ -88,158 +88,150 @@ typedef enum { } teOptIndex; #define OPTION_CT 34 -#define NTPD_VERSION "4.2.3p41" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.3p41" +#define NTPD_VERSION "4.2.3p42" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.3p42" + +/* + * Interface defines for all options. Replace "n" with the UPPER_CASED + * option name (as in the teOptIndex enumeration above). + * e.g. HAVE_OPT( IPV4 ) + */ +#define DESC(n) ntpdOptions.pOptDesc[INDEX_OPT_ ## n] +#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) +#define OPT_ARG(n) (DESC(n).pzLastArg) +#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) +#define COUNT_OPT(n) (DESC(n).optOccCt) +#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) +#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) +#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) +#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) +#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) +#define CLEAR_OPT(n) STMTS( \ + DESC(n).fOptState &= OPTST_PERSISTENT; \ + if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ + 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 -# warn undefining IPV4 due to option name conflict -# undef IPV4 +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef IPV4 +# warning undefining IPV4 due to option name conflict +# undef IPV4 # endif - -# ifdef IPV6 -# warn undefining IPV6 due to option name conflict -# undef IPV6 +# ifdef IPV6 +# warning undefining IPV6 due to option name conflict +# undef IPV6 # endif - -# ifdef AUTHREQ -# warn undefining AUTHREQ due to option name conflict -# undef AUTHREQ +# ifdef AUTHREQ +# warning undefining AUTHREQ due to option name conflict +# undef AUTHREQ # endif - -# ifdef AUTHNOREQ -# warn undefining AUTHNOREQ due to option name conflict -# undef AUTHNOREQ +# ifdef AUTHNOREQ +# warning undefining AUTHNOREQ due to option name conflict +# undef AUTHNOREQ # endif - -# ifdef BCASTSYNC -# warn undefining BCASTSYNC due to option name conflict -# undef BCASTSYNC +# ifdef BCASTSYNC +# warning undefining BCASTSYNC due to option name conflict +# undef BCASTSYNC # endif - -# ifdef CONFIGFILE -# warn undefining CONFIGFILE due to option name conflict -# undef CONFIGFILE +# ifdef CONFIGFILE +# warning 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 +# ifdef DEBUG_LEVEL +# warning 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 +# ifdef SET_DEBUG_LEVEL +# warning 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 +# ifdef DRIFTFILE +# warning undefining DRIFTFILE due to option name conflict +# undef DRIFTFILE # endif - -# ifdef PANICGATE -# warn undefining PANICGATE due to option name conflict -# undef PANICGATE +# ifdef PANICGATE +# warning undefining PANICGATE due to option name conflict +# undef PANICGATE # endif - -# ifdef JAILDIR -# warn undefining JAILDIR due to option name conflict -# undef JAILDIR +# ifdef JAILDIR +# warning undefining JAILDIR due to option name conflict +# undef JAILDIR # endif - -# ifdef INTERFACE -# warn undefining INTERFACE due to option name conflict -# undef INTERFACE +# ifdef INTERFACE +# warning undefining INTERFACE due to option name conflict +# undef INTERFACE # endif - -# ifdef KEYFILE -# warn undefining KEYFILE due to option name conflict -# undef KEYFILE +# ifdef KEYFILE +# warning undefining KEYFILE due to option name conflict +# undef KEYFILE # endif - -# ifdef LOGFILE -# warn undefining LOGFILE due to option name conflict -# undef LOGFILE +# ifdef LOGFILE +# warning undefining LOGFILE due to option name conflict +# undef LOGFILE # endif - -# ifdef NOVIRTUALIPS -# warn undefining NOVIRTUALIPS due to option name conflict -# undef NOVIRTUALIPS +# ifdef NOVIRTUALIPS +# warning undefining NOVIRTUALIPS due to option name conflict +# undef NOVIRTUALIPS # endif - -# ifdef MODIFYMMTIMER -# warn undefining MODIFYMMTIMER due to option name conflict -# undef MODIFYMMTIMER +# ifdef MODIFYMMTIMER +# warning undefining MODIFYMMTIMER due to option name conflict +# undef MODIFYMMTIMER # endif - -# ifdef NOFORK -# warn undefining NOFORK due to option name conflict -# undef NOFORK +# ifdef NOFORK +# warning undefining NOFORK due to option name conflict +# undef NOFORK # endif - -# ifdef NICE -# warn undefining NICE due to option name conflict -# undef NICE +# ifdef NICE +# warning undefining NICE due to option name conflict +# undef NICE # endif - -# ifdef PIDFILE -# warn undefining PIDFILE due to option name conflict -# undef PIDFILE +# ifdef PIDFILE +# warning undefining PIDFILE due to option name conflict +# undef PIDFILE # endif - -# ifdef PRIORITY -# warn undefining PRIORITY due to option name conflict -# undef PRIORITY +# ifdef PRIORITY +# warning undefining PRIORITY due to option name conflict +# undef PRIORITY # endif - -# ifdef QUIT -# warn undefining QUIT due to option name conflict -# undef QUIT +# ifdef QUIT +# warning undefining QUIT due to option name conflict +# undef QUIT # endif - -# ifdef PROPAGATIONDELAY -# warn undefining PROPAGATIONDELAY due to option name conflict -# undef PROPAGATIONDELAY +# ifdef PROPAGATIONDELAY +# warning undefining PROPAGATIONDELAY due to option name conflict +# undef PROPAGATIONDELAY # endif - -# ifdef UPDATEINTERVAL -# warn undefining UPDATEINTERVAL due to option name conflict -# undef UPDATEINTERVAL +# ifdef UPDATEINTERVAL +# warning undefining UPDATEINTERVAL due to option name conflict +# undef UPDATEINTERVAL # endif - -# ifdef STATSDIR -# warn undefining STATSDIR due to option name conflict -# undef STATSDIR +# ifdef STATSDIR +# warning undefining STATSDIR due to option name conflict +# undef STATSDIR # endif - -# ifdef TRUSTEDKEY -# warn undefining TRUSTEDKEY due to option name conflict -# undef TRUSTEDKEY +# ifdef TRUSTEDKEY +# warning undefining TRUSTEDKEY due to option name conflict +# undef TRUSTEDKEY # endif - -# ifdef USER -# warn undefining USER due to option name conflict -# undef USER +# ifdef USER +# warning undefining USER due to option name conflict +# undef USER # endif - -# ifdef VAR -# warn undefining VAR due to option name conflict -# undef VAR +# ifdef VAR +# warning undefining VAR due to option name conflict +# undef VAR # endif - -# ifdef DVAR -# warn undefining DVAR due to option name conflict -# undef DVAR +# ifdef DVAR +# warning undefining DVAR due to option name conflict +# undef DVAR # endif - -# ifdef SLEW -# warn undefining SLEW due to option name conflict -# undef SLEW +# ifdef SLEW +# warning undefining SLEW due to option name conflict +# undef SLEW # endif - #else /* NO_OPTION_NAME_WARNINGS */ # undef IPV4 # undef IPV6 @@ -270,28 +262,7 @@ typedef enum { # undef VAR # undef DVAR # undef SLEW -#endif /* NO_OPTION_NAME_WARNINGS */ - -/* - * Interface defines for all options. Replace "n" with - * the UPPER_CASED option name (as in the teOptIndex - * enumeration above). e.g. HAVE_OPT( IPV4 ) - */ -#define DESC(n) ntpdOptions.pOptDesc[INDEX_OPT_ ## n] -#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) -#define OPT_ARG(n) (DESC(n).pzLastArg) -#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) -#define COUNT_OPT(n) (DESC(n).optOccCt) -#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) -#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) -#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) -#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) -#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) -#define CLEAR_OPT(n) STMTS( \ - DESC(n).fOptState &= OPTST_PERSISTENT; \ - if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ - DESC(n).fOptState |= OPTST_DISABLED; \ - DESC(n).optCookie = NULL ) +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for specific options. @@ -355,7 +326,7 @@ typedef enum { ntpdOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdOptions.pUsageProc)( &ntpdOptions, c ) -/* extracted from opthead near line 316 */ +/* extracted from opthead near line 311 */ /* * * * * * * diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index c58f94828..75d0bf4a4 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 Saturday September 9, 2006 at 05:11:07 AM EDT +# It has been AutoGen-ed Sunday September 10, 2006 at 07:38:46 AM 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 668e84aba..700747e28 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2006-09-09 "( 4.2.3p41)" "Programmer's Manual" +.TH NTPD 1 2006-09-10 "( 4.2.3p42)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpd.1) .\" -.\" It has been AutoGen-ed Saturday September 9, 2006 at 05:11:06 AM EDT +.\" It has been AutoGen-ed Sunday September 10, 2006 at 07:38:46 AM 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 19fe05c60..70c92266e 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 Saturday September 9, 2006 at 05:11:09 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:38:49 AM 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.3p41\n\ +"ntpdsim - NTP daemon simulation program - Ver. 4.2.3p42\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index be2ff2faf..ea4d82e07 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 Saturday September 9, 2006 at 05:11:08 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:38:48 AM EDT * From the definitions ntpdsim-opts.def * and the template file options */ @@ -97,203 +97,186 @@ typedef enum { } teOptIndex; #define OPTION_CT 43 -#define NTPDSIM_VERSION "4.2.3p41" -#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.3p41" +#define NTPDSIM_VERSION "4.2.3p42" +#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.3p42" + +/* + * Interface defines for all options. Replace "n" with the UPPER_CASED + * option name (as in the teOptIndex enumeration above). + * e.g. HAVE_OPT( IPV4 ) + */ +#define DESC(n) ntpdsimOptions.pOptDesc[INDEX_OPT_ ## n] +#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) +#define OPT_ARG(n) (DESC(n).pzLastArg) +#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) +#define COUNT_OPT(n) (DESC(n).optOccCt) +#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) +#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) +#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) +#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) +#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) +#define CLEAR_OPT(n) STMTS( \ + DESC(n).fOptState &= OPTST_PERSISTENT; \ + if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ + 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 -# warn undefining IPV4 due to option name conflict -# undef IPV4 +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef IPV4 +# warning undefining IPV4 due to option name conflict +# undef IPV4 # endif - -# ifdef IPV6 -# warn undefining IPV6 due to option name conflict -# undef IPV6 +# ifdef IPV6 +# warning undefining IPV6 due to option name conflict +# undef IPV6 # endif - -# ifdef AUTHREQ -# warn undefining AUTHREQ due to option name conflict -# undef AUTHREQ +# ifdef AUTHREQ +# warning undefining AUTHREQ due to option name conflict +# undef AUTHREQ # endif - -# ifdef AUTHNOREQ -# warn undefining AUTHNOREQ due to option name conflict -# undef AUTHNOREQ +# ifdef AUTHNOREQ +# warning undefining AUTHNOREQ due to option name conflict +# undef AUTHNOREQ # endif - -# ifdef BCASTSYNC -# warn undefining BCASTSYNC due to option name conflict -# undef BCASTSYNC +# ifdef BCASTSYNC +# warning undefining BCASTSYNC due to option name conflict +# undef BCASTSYNC # endif - -# ifdef SIMBROADCASTDELAY -# warn undefining SIMBROADCASTDELAY due to option name conflict -# undef SIMBROADCASTDELAY +# ifdef SIMBROADCASTDELAY +# warning undefining SIMBROADCASTDELAY due to option name conflict +# undef SIMBROADCASTDELAY # endif - -# ifdef CONFIGFILE -# warn undefining CONFIGFILE due to option name conflict -# undef CONFIGFILE +# ifdef CONFIGFILE +# warning undefining CONFIGFILE due to option name conflict +# undef CONFIGFILE # endif - -# ifdef PHASENOISE -# warn undefining PHASENOISE due to option name conflict -# undef PHASENOISE +# ifdef PHASENOISE +# warning 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 +# ifdef DEBUG_LEVEL +# warning 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 +# ifdef SET_DEBUG_LEVEL +# warning 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 +# ifdef DRIFTFILE +# warning undefining DRIFTFILE due to option name conflict +# undef DRIFTFILE # endif - -# ifdef PANICGATE -# warn undefining PANICGATE due to option name conflict -# undef PANICGATE +# ifdef PANICGATE +# warning undefining PANICGATE due to option name conflict +# undef PANICGATE # endif - -# ifdef SIMSLEW -# warn undefining SIMSLEW due to option name conflict -# undef SIMSLEW +# ifdef SIMSLEW +# warning undefining SIMSLEW due to option name conflict +# undef SIMSLEW # endif - -# ifdef JAILDIR -# warn undefining JAILDIR due to option name conflict -# undef JAILDIR +# ifdef JAILDIR +# warning undefining JAILDIR due to option name conflict +# undef JAILDIR # endif - -# ifdef INTERFACE -# warn undefining INTERFACE due to option name conflict -# undef INTERFACE +# ifdef INTERFACE +# warning undefining INTERFACE due to option name conflict +# undef INTERFACE # endif - -# ifdef KEYFILE -# warn undefining KEYFILE due to option name conflict -# undef KEYFILE +# ifdef KEYFILE +# warning undefining KEYFILE due to option name conflict +# undef KEYFILE # endif - -# ifdef LOGFILE -# warn undefining LOGFILE due to option name conflict -# undef LOGFILE +# ifdef LOGFILE +# warning undefining LOGFILE due to option name conflict +# undef LOGFILE # endif - -# ifdef NOVIRTUALIPS -# warn undefining NOVIRTUALIPS due to option name conflict -# undef NOVIRTUALIPS +# ifdef NOVIRTUALIPS +# warning undefining NOVIRTUALIPS due to option name conflict +# undef NOVIRTUALIPS # endif - -# ifdef MODIFYMMTIMER -# warn undefining MODIFYMMTIMER due to option name conflict -# undef MODIFYMMTIMER +# ifdef MODIFYMMTIMER +# warning undefining MODIFYMMTIMER due to option name conflict +# undef MODIFYMMTIMER # endif - -# ifdef NOFORK -# warn undefining NOFORK due to option name conflict -# undef NOFORK +# ifdef NOFORK +# warning undefining NOFORK due to option name conflict +# undef NOFORK # endif - -# ifdef NICE -# warn undefining NICE due to option name conflict -# undef NICE +# ifdef NICE +# warning undefining NICE due to option name conflict +# undef NICE # endif - -# ifdef SERVERTIME -# warn undefining SERVERTIME due to option name conflict -# undef SERVERTIME +# ifdef SERVERTIME +# warning undefining SERVERTIME due to option name conflict +# undef SERVERTIME # endif - -# ifdef PIDFILE -# warn undefining PIDFILE due to option name conflict -# undef PIDFILE +# ifdef PIDFILE +# warning undefining PIDFILE due to option name conflict +# undef PIDFILE # endif - -# ifdef PRIORITY -# warn undefining PRIORITY due to option name conflict -# undef PRIORITY +# ifdef PRIORITY +# warning undefining PRIORITY due to option name conflict +# undef PRIORITY # endif - -# ifdef QUIT -# warn undefining QUIT due to option name conflict -# undef QUIT +# ifdef QUIT +# warning undefining QUIT due to option name conflict +# undef QUIT # endif - -# ifdef PROPAGATIONDELAY -# warn undefining PROPAGATIONDELAY due to option name conflict -# undef PROPAGATIONDELAY +# ifdef PROPAGATIONDELAY +# warning undefining PROPAGATIONDELAY due to option name conflict +# undef PROPAGATIONDELAY # endif - -# ifdef UPDATEINTERVAL -# warn undefining UPDATEINTERVAL due to option name conflict -# undef UPDATEINTERVAL +# ifdef UPDATEINTERVAL +# warning undefining UPDATEINTERVAL due to option name conflict +# undef UPDATEINTERVAL # endif - -# ifdef STATSDIR -# warn undefining STATSDIR due to option name conflict -# undef STATSDIR +# ifdef STATSDIR +# warning undefining STATSDIR due to option name conflict +# undef STATSDIR # endif - -# ifdef ENDSIMTIME -# warn undefining ENDSIMTIME due to option name conflict -# undef ENDSIMTIME +# ifdef ENDSIMTIME +# warning undefining ENDSIMTIME due to option name conflict +# undef ENDSIMTIME # endif - -# ifdef TRUSTEDKEY -# warn undefining TRUSTEDKEY due to option name conflict -# undef TRUSTEDKEY +# ifdef TRUSTEDKEY +# warning undefining TRUSTEDKEY due to option name conflict +# undef TRUSTEDKEY # endif - -# ifdef FREQERR -# warn undefining FREQERR due to option name conflict -# undef FREQERR +# ifdef FREQERR +# warning undefining FREQERR due to option name conflict +# undef FREQERR # endif - -# ifdef WALKNOISE -# warn undefining WALKNOISE due to option name conflict -# undef WALKNOISE +# ifdef WALKNOISE +# warning undefining WALKNOISE due to option name conflict +# undef WALKNOISE # endif - -# ifdef USER -# warn undefining USER due to option name conflict -# undef USER +# ifdef USER +# warning undefining USER due to option name conflict +# undef USER # endif - -# ifdef VAR -# warn undefining VAR due to option name conflict -# undef VAR +# ifdef VAR +# warning undefining VAR due to option name conflict +# undef VAR # endif - -# ifdef DVAR -# warn undefining DVAR due to option name conflict -# undef DVAR +# ifdef DVAR +# warning undefining DVAR due to option name conflict +# undef DVAR # endif - -# ifdef SLEW -# warn undefining SLEW due to option name conflict -# undef SLEW +# ifdef SLEW +# warning undefining SLEW due to option name conflict +# undef SLEW # endif - -# ifdef NDELAY -# warn undefining NDELAY due to option name conflict -# undef NDELAY +# ifdef NDELAY +# warning undefining NDELAY due to option name conflict +# undef NDELAY # endif - -# ifdef PDELAY -# warn undefining PDELAY due to option name conflict -# undef PDELAY +# ifdef PDELAY +# warning undefining PDELAY due to option name conflict +# undef PDELAY # endif - #else /* NO_OPTION_NAME_WARNINGS */ # undef IPV4 # undef IPV6 @@ -333,28 +316,7 @@ typedef enum { # undef SLEW # undef NDELAY # undef PDELAY -#endif /* NO_OPTION_NAME_WARNINGS */ - -/* - * Interface defines for all options. Replace "n" with - * the UPPER_CASED option name (as in the teOptIndex - * enumeration above). e.g. HAVE_OPT( IPV4 ) - */ -#define DESC(n) ntpdsimOptions.pOptDesc[INDEX_OPT_ ## n] -#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) -#define OPT_ARG(n) (DESC(n).pzLastArg) -#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) -#define COUNT_OPT(n) (DESC(n).optOccCt) -#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) -#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) -#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) -#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) -#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) -#define CLEAR_OPT(n) STMTS( \ - DESC(n).fOptState &= OPTST_PERSISTENT; \ - if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ - DESC(n).fOptState |= OPTST_DISABLED; \ - DESC(n).optCookie = NULL ) +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for specific options. @@ -427,7 +389,7 @@ typedef enum { ntpdsimOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdsimOptions.pUsageProc)( &ntpdsimOptions, c ) -/* extracted from opthead near line 316 */ +/* extracted from opthead near line 311 */ /* * * * * * * diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi index c70ada80f..dabdf3c8b 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 Saturday September 9, 2006 at 05:11:12 AM EDT +# It has been AutoGen-ed Sunday September 10, 2006 at 07:38:52 AM 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 8a80bc74a..2f5236ddc 100644 --- a/ntpd/ntpdsim.1 +++ b/ntpd/ntpdsim.1 @@ -1,7 +1,7 @@ -.TH NTPDSIM 1 2006-09-09 "( 4.2.3p41)" "Programmer's Manual" +.TH NTPDSIM 1 2006-09-10 "( 4.2.3p42)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpdsim.1) .\" -.\" It has been AutoGen-ed Saturday September 9, 2006 at 05:11:10 AM EDT +.\" It has been AutoGen-ed Sunday September 10, 2006 at 07:38:50 AM 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 e7cff9ce4..3e2b5c8dc 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 Saturday September 9, 2006 at 05:17:22 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:45:24 AM 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.3p41\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.3p42\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index bcf063957..b4d67141a 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 Saturday September 9, 2006 at 05:17:21 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:45:23 AM EDT * From the definitions ntpdc-opts.def * and the template file options */ @@ -69,63 +69,74 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.3p41" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.3p41" +#define NTPDC_VERSION "4.2.3p42" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.3p42" + +/* + * Interface defines for all options. Replace "n" with the UPPER_CASED + * option name (as in the teOptIndex enumeration above). + * e.g. HAVE_OPT( IPV4 ) + */ +#define DESC(n) ntpdcOptions.pOptDesc[INDEX_OPT_ ## n] +#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) +#define OPT_ARG(n) (DESC(n).pzLastArg) +#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) +#define COUNT_OPT(n) (DESC(n).optOccCt) +#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) +#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) +#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) +#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) +#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) +#define CLEAR_OPT(n) STMTS( \ + DESC(n).fOptState &= OPTST_PERSISTENT; \ + if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ + 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 -# warn undefining IPV4 due to option name conflict -# undef IPV4 +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef IPV4 +# warning undefining IPV4 due to option name conflict +# undef IPV4 # endif - -# ifdef IPV6 -# warn undefining IPV6 due to option name conflict -# undef IPV6 +# ifdef IPV6 +# warning undefining IPV6 due to option name conflict +# undef IPV6 # endif - -# ifdef COMMAND -# warn undefining COMMAND due to option name conflict -# undef COMMAND +# ifdef COMMAND +# warning undefining COMMAND due to option name conflict +# undef COMMAND # endif - -# ifdef LISTPEERS -# warn undefining LISTPEERS due to option name conflict -# undef LISTPEERS +# ifdef LISTPEERS +# warning undefining LISTPEERS due to option name conflict +# undef LISTPEERS # endif - -# ifdef PEERS -# warn undefining PEERS due to option name conflict -# undef PEERS +# ifdef PEERS +# warning undefining PEERS due to option name conflict +# undef PEERS # endif - -# ifdef SHOWPEERS -# warn undefining SHOWPEERS due to option name conflict -# undef SHOWPEERS +# ifdef SHOWPEERS +# warning undefining SHOWPEERS due to option name conflict +# undef SHOWPEERS # endif - -# ifdef INTERACTIVE -# warn undefining INTERACTIVE due to option name conflict -# undef INTERACTIVE +# ifdef INTERACTIVE +# warning 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 +# ifdef DEBUG_LEVEL +# warning 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 +# ifdef SET_DEBUG_LEVEL +# warning 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 +# ifdef NUMERIC +# warning undefining NUMERIC due to option name conflict +# undef NUMERIC # endif - #else /* NO_OPTION_NAME_WARNINGS */ # undef IPV4 # undef IPV6 @@ -137,28 +148,7 @@ typedef enum { # undef DEBUG_LEVEL # undef SET_DEBUG_LEVEL # undef NUMERIC -#endif /* NO_OPTION_NAME_WARNINGS */ - -/* - * Interface defines for all options. Replace "n" with - * the UPPER_CASED option name (as in the teOptIndex - * enumeration above). e.g. HAVE_OPT( IPV4 ) - */ -#define DESC(n) ntpdcOptions.pOptDesc[INDEX_OPT_ ## n] -#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) -#define OPT_ARG(n) (DESC(n).pzLastArg) -#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) -#define COUNT_OPT(n) (DESC(n).optOccCt) -#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) -#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) -#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) -#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) -#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) -#define CLEAR_OPT(n) STMTS( \ - DESC(n).fOptState &= OPTST_PERSISTENT; \ - if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ - DESC(n).fOptState |= OPTST_DISABLED; \ - DESC(n).optCookie = NULL ) +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for specific options. @@ -199,7 +189,7 @@ typedef enum { ntpdcOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdcOptions.pUsageProc)( &ntpdcOptions, c ) -/* extracted from opthead near line 316 */ +/* extracted from opthead near line 311 */ /* * * * * * * diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 5193c8699..b897cee24 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 Saturday September 9, 2006 at 05:17:24 AM EDT +# It has been AutoGen-ed Sunday September 10, 2006 at 07:45:26 AM 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 4140b9284..5d6fbb9ea 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2006-09-09 "( 4.2.3p41)" "Programmer's Manual" +.TH NTPDC 1 2006-09-10 "( 4.2.3p42)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpdc.1) .\" -.\" It has been AutoGen-ed Saturday September 9, 2006 at 05:17:23 AM EDT +.\" It has been AutoGen-ed Sunday September 10, 2006 at 07:45:25 AM 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 13c70877b..1c4f08619 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 Saturday September 9, 2006 at 05:17:52 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:45:52 AM 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.3p41\n\ +"ntpq - standard NTP query program - Ver. 4.2.3p42\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index 3aebcf6ea..6b5e44b68 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 Saturday September 9, 2006 at 05:17:52 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:45:52 AM EDT * From the definitions ntpq-opts.def * and the template file options */ @@ -67,53 +67,66 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define NTPQ_VERSION "4.2.3p41" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.3p41" +#define NTPQ_VERSION "4.2.3p42" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.3p42" + +/* + * Interface defines for all options. Replace "n" with the UPPER_CASED + * option name (as in the teOptIndex enumeration above). + * e.g. HAVE_OPT( IPV4 ) + */ +#define DESC(n) ntpqOptions.pOptDesc[INDEX_OPT_ ## n] +#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) +#define OPT_ARG(n) (DESC(n).pzLastArg) +#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) +#define COUNT_OPT(n) (DESC(n).optOccCt) +#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) +#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) +#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) +#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) +#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) +#define CLEAR_OPT(n) STMTS( \ + DESC(n).fOptState &= OPTST_PERSISTENT; \ + if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ + 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 -# warn undefining IPV4 due to option name conflict -# undef IPV4 +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef IPV4 +# warning undefining IPV4 due to option name conflict +# undef IPV4 # endif - -# ifdef IPV6 -# warn undefining IPV6 due to option name conflict -# undef IPV6 +# ifdef IPV6 +# warning undefining IPV6 due to option name conflict +# undef IPV6 # endif - -# ifdef COMMAND -# warn undefining COMMAND due to option name conflict -# undef COMMAND +# ifdef COMMAND +# warning 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 +# ifdef DEBUG_LEVEL +# warning 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 +# ifdef SET_DEBUG_LEVEL +# warning 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 +# ifdef PEERS +# warning undefining PEERS due to option name conflict +# undef PEERS # endif - -# ifdef INTERACTIVE -# warn undefining INTERACTIVE due to option name conflict -# undef INTERACTIVE +# ifdef INTERACTIVE +# warning undefining INTERACTIVE due to option name conflict +# undef INTERACTIVE # endif - -# ifdef NUMERIC -# warn undefining NUMERIC due to option name conflict -# undef NUMERIC +# ifdef NUMERIC +# warning undefining NUMERIC due to option name conflict +# undef NUMERIC # endif - #else /* NO_OPTION_NAME_WARNINGS */ # undef IPV4 # undef IPV6 @@ -123,28 +136,7 @@ typedef enum { # undef PEERS # undef INTERACTIVE # undef NUMERIC -#endif /* NO_OPTION_NAME_WARNINGS */ - -/* - * Interface defines for all options. Replace "n" with - * the UPPER_CASED option name (as in the teOptIndex - * enumeration above). e.g. HAVE_OPT( IPV4 ) - */ -#define DESC(n) ntpqOptions.pOptDesc[INDEX_OPT_ ## n] -#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) -#define OPT_ARG(n) (DESC(n).pzLastArg) -#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) -#define COUNT_OPT(n) (DESC(n).optOccCt) -#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) -#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) -#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) -#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) -#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) -#define CLEAR_OPT(n) STMTS( \ - DESC(n).fOptState &= OPTST_PERSISTENT; \ - if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ - DESC(n).fOptState |= OPTST_DISABLED; \ - DESC(n).optCookie = NULL ) +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for specific options. @@ -183,7 +175,7 @@ typedef enum { ntpqOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpqOptions.pUsageProc)( &ntpqOptions, c ) -/* extracted from opthead near line 316 */ +/* extracted from opthead near line 311 */ /* * * * * * * diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index d978f953e..081692237 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 Saturday September 9, 2006 at 05:17:54 AM EDT +# It has been AutoGen-ed Sunday September 10, 2006 at 07:45:54 AM 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 bd8b3a2b4..c34b182fd 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2006-09-09 "( 4.2.3p41)" "Programmer's Manual" +.TH NTPQ 1 2006-09-10 "( 4.2.3p42)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpq.1) .\" -.\" It has been AutoGen-ed Saturday September 9, 2006 at 05:17:53 AM EDT +.\" It has been AutoGen-ed Sunday September 10, 2006 at 07:45:53 AM EDT .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 8e83cf7f0..258a5c22f 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=41 +point=42 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index c698faa55..0075a64b5 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 Saturday September 9, 2006 at 05:18:21 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:46:21 AM EDT * From the definitions sntp-opts.def * and the template file options */ @@ -481,7 +481,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.3p41\n\ +"sntp - standard SNTP program - Ver. 4.2.3p42\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 9d6931e39..de3fa4005 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 Saturday September 9, 2006 at 05:18:21 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:46:21 AM EDT * From the definitions sntp-opts.def * and the template file options */ @@ -145,48 +145,62 @@ typedef enum { } teOptIndex; #define OPTION_CT 12 -#define SNTP_VERSION "4.2.3p41" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.3p41" +#define SNTP_VERSION "4.2.3p42" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.3p42" + +/* + * Interface defines for all options. Replace "n" with the UPPER_CASED + * option name (as in the teOptIndex enumeration above). + * e.g. HAVE_OPT( IPV4 ) + */ +#define DESC(n) sntpOptions.pOptDesc[INDEX_OPT_ ## n] +#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) +#define OPT_ARG(n) (DESC(n).pzLastArg) +#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) +#define COUNT_OPT(n) (DESC(n).optOccCt) +#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) +#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) +#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) +#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) +#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) +#define CLEAR_OPT(n) STMTS( \ + DESC(n).fOptState &= OPTST_PERSISTENT; \ + if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ + 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 -# warn undefining IPV4 due to option name conflict -# undef IPV4 +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef IPV4 +# warning undefining IPV4 due to option name conflict +# undef IPV4 # endif - -# ifdef IPV6 -# warn undefining IPV6 due to option name conflict -# undef IPV6 +# ifdef IPV6 +# warning undefining IPV6 due to option name conflict +# undef IPV6 # endif - -# ifdef NORMALVERBOSE -# warn undefining NORMALVERBOSE due to option name conflict -# undef NORMALVERBOSE +# ifdef NORMALVERBOSE +# warning undefining NORMALVERBOSE due to option name conflict +# undef NORMALVERBOSE # endif - -# ifdef EXTRAVERBOSE -# warn undefining EXTRAVERBOSE due to option name conflict -# undef EXTRAVERBOSE +# ifdef EXTRAVERBOSE +# warning undefining EXTRAVERBOSE due to option name conflict +# undef EXTRAVERBOSE # endif - -# ifdef MEGAVERBOSE -# warn undefining MEGAVERBOSE due to option name conflict -# undef MEGAVERBOSE +# ifdef MEGAVERBOSE +# warning undefining MEGAVERBOSE due to option name conflict +# undef MEGAVERBOSE # endif - -# ifdef SETTIMEOFDAY -# warn undefining SETTIMEOFDAY due to option name conflict -# undef SETTIMEOFDAY +# ifdef SETTIMEOFDAY +# warning undefining SETTIMEOFDAY due to option name conflict +# undef SETTIMEOFDAY # endif - -# ifdef ADJTIME -# warn undefining ADJTIME due to option name conflict -# undef ADJTIME +# ifdef ADJTIME +# warning undefining ADJTIME due to option name conflict +# undef ADJTIME # endif - #else /* NO_OPTION_NAME_WARNINGS */ # undef IPV4 # undef IPV6 @@ -195,28 +209,7 @@ typedef enum { # undef MEGAVERBOSE # undef SETTIMEOFDAY # undef ADJTIME -#endif /* NO_OPTION_NAME_WARNINGS */ - -/* - * Interface defines for all options. Replace "n" with - * the UPPER_CASED option name (as in the teOptIndex - * enumeration above). e.g. HAVE_OPT( IPV4 ) - */ -#define DESC(n) sntpOptions.pOptDesc[INDEX_OPT_ ## n] -#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) -#define OPT_ARG(n) (DESC(n).pzLastArg) -#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) -#define COUNT_OPT(n) (DESC(n).optOccCt) -#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) -#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) -#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) -#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) -#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) -#define CLEAR_OPT(n) STMTS( \ - DESC(n).fOptState &= OPTST_PERSISTENT; \ - if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ - DESC(n).fOptState |= OPTST_DISABLED; \ - DESC(n).optCookie = NULL ) +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for specific options. @@ -250,7 +243,7 @@ typedef enum { sntpOptions.pzCurOpt = NULL ) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*sntpOptions.pUsageProc)( &sntpOptions, c ) -/* extracted from opthead near line 316 */ +/* extracted from opthead near line 311 */ /* * * * * * * diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index 69a950488..2ccda9482 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 Saturday September 9, 2006 at 05:18:24 AM EDT +# It has been AutoGen-ed Sunday September 10, 2006 at 07:46:24 AM 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 92107025c..915ac65e5 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 Saturday September 9, 2006 at 05:18:31 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:47:13 AM 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.3p41\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p42\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index abb3009e9..8a16452bb 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 Saturday September 9, 2006 at 05:18:30 AM EDT + * It has been AutoGen-ed Sunday September 10, 2006 at 07:47:13 AM EDT * From the definitions ntp-keygen-opts.def * and the template file options */ @@ -78,108 +78,110 @@ typedef enum { } teOptIndex; #define OPTION_CT 24 -#define NTP_KEYGEN_VERSION "4.2.3p41" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p41" +#define NTP_KEYGEN_VERSION "4.2.3p42" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p42" + +/* + * Interface defines for all options. Replace "n" with the UPPER_CASED + * option name (as in the teOptIndex enumeration above). + * e.g. HAVE_OPT( CERTIFICATE ) + */ +#define DESC(n) ntp_keygenOptions.pOptDesc[INDEX_OPT_ ## n] +#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) +#define OPT_ARG(n) (DESC(n).pzLastArg) +#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) +#define COUNT_OPT(n) (DESC(n).optOccCt) +#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) +#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) +#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) +#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) +#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) +#define CLEAR_OPT(n) STMTS( \ + DESC(n).fOptState &= OPTST_PERSISTENT; \ + if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ + 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 CERTIFICATE -# warn undefining CERTIFICATE due to option name conflict -# undef CERTIFICATE +#ifndef NO_OPTION_NAME_WARNINGS +# ifdef CERTIFICATE +# warning 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 +# ifdef DEBUG_LEVEL +# warning 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 +# ifdef SET_DEBUG_LEVEL +# warning 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 +# ifdef ID_KEY +# warning 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 +# ifdef GQ_PARAMS +# warning 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 +# ifdef GQ_KEYS +# warning 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 +# ifdef HOST_KEY +# warning undefining HOST_KEY due to option name conflict +# undef HOST_KEY # endif - -# ifdef IFFKEY -# warn undefining IFFKEY due to option name conflict -# undef IFFKEY +# ifdef IFFKEY +# warning 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 +# ifdef ISSUER_NAME +# warning undefining ISSUER_NAME due to option name conflict +# undef ISSUER_NAME # endif - -# ifdef MD5KEY -# warn undefining MD5KEY due to option name conflict -# undef MD5KEY +# ifdef MD5KEY +# warning undefining MD5KEY due to option name conflict +# undef MD5KEY # endif - -# ifdef MODULUS -# warn undefining MODULUS due to option name conflict -# undef MODULUS +# ifdef MODULUS +# warning 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 +# ifdef PVT_CERT +# warning 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 +# ifdef PVT_PASSWD +# warning 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 +# ifdef GET_PVT_PASSWD +# warning 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 +# ifdef SIGN_KEY +# warning 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 +# ifdef SUBJECT_NAME +# warning 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 +# ifdef TRUSTED_CERT +# warning 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 +# ifdef MV_PARAMS +# warning 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 +# ifdef MV_KEYS +# warning undefining MV_KEYS due to option name conflict +# undef MV_KEYS # endif - #else /* NO_OPTION_NAME_WARNINGS */ # undef CERTIFICATE # undef DEBUG_LEVEL @@ -200,28 +202,7 @@ typedef enum { # undef TRUSTED_CERT # undef MV_PARAMS # undef MV_KEYS -#endif /* NO_OPTION_NAME_WARNINGS */ - -/* - * Interface defines for all options. Replace "n" with - * the UPPER_CASED option name (as in the teOptIndex - * enumeration above). e.g. HAVE_OPT( CERTIFICATE ) - */ -#define DESC(n) ntp_keygenOptions.pOptDesc[INDEX_OPT_ ## n] -#define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) -#define OPT_ARG(n) (DESC(n).pzLastArg) -#define STATE_OPT(n) (DESC(n).fOptState & OPTST_SET_MASK) -#define COUNT_OPT(n) (DESC(n).optOccCt) -#define ISSEL_OPT(n) (SELECTED_OPT(&DESC(n))) -#define ISUNUSED_OPT(n) (UNUSED_OPT(& DESC(n))) -#define ENABLED_OPT(n) (! DISABLED_OPT(& DESC(n))) -#define STACKCT_OPT(n) (((tArgList*)(DESC(n).optCookie))->useCt) -#define STACKLST_OPT(n) (((tArgList*)(DESC(n).optCookie))->apzArgs) -#define CLEAR_OPT(n) STMTS( \ - DESC(n).fOptState &= OPTST_PERSISTENT; \ - if ( (DESC(n).fOptState & OPTST_INITENABLED) == 0) \ - DESC(n).fOptState |= OPTST_DISABLED; \ - DESC(n).optCookie = NULL ) +#endif /* NO_OPTION_NAME_WARNINGS */ /* * Interface defines for specific options. @@ -304,7 +285,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 316 */ +/* extracted from opthead near line 311 */ /* * * * * * * diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index 14636e9b6..52e7b2f9a 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 Saturday September 9, 2006 at 05:18:33 AM EDT +# It has been AutoGen-ed Sunday September 10, 2006 at 07:47:16 AM 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 1919310ee..f918825ee 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2006-09-09 "(ntp 4.2.3p41)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2006-09-10 "(ntp 4.2.3p42)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Saturday September 9, 2006 at 05:18:32 AM EDT +.\" It has been AutoGen-ed Sunday September 10, 2006 at 07:47:15 AM EDT .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\" -- 2.47.3