From: Harlan Stenn Date: Sun, 24 Sep 2006 09:30:52 +0000 (-0400) Subject: NTP_4_2_3P50 X-Git-Tag: NTP_4_2_3P50^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84cc2411e5a7c0bdb33cfd1109f780b42ab46146;p=thirdparty%2Fntp.git NTP_4_2_3P50 bk: 4516504c8KF66eVGErbU50fDWybH7Q --- diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 8235f27d8..d22dd6f9d 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 September 21, 2006 at 07:34:21 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:20:44 AM EDT * From the definitions ntpd-opts.def * and the template file options */ @@ -24,6 +24,7 @@ */ +#include #define OPTION_CODE_COMPILE 1 #include "ntpd-opts.h" @@ -118,7 +119,7 @@ tSCC zConfigfileText[] = tSCC zConfigfile_NAME[] = "CONFIGFILE"; tSCC zConfigfile_Name[] = "configfile"; #define CONFIGFILE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Debug_Level option description: @@ -147,7 +148,7 @@ tSCC zSet_Debug_LevelText[] = tSCC zSet_Debug_Level_NAME[] = "SET_DEBUG_LEVEL"; tSCC zSet_Debug_Level_Name[] = "set-debug-level"; #define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Set_Debug_Level */ #define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT @@ -165,7 +166,7 @@ tSCC zDriftfileText[] = tSCC zDriftfile_NAME[] = "DRIFTFILE"; tSCC zDriftfile_Name[] = "driftfile"; #define DRIFTFILE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Panicgate option description: @@ -184,7 +185,7 @@ tSCC zJaildirText[] = tSCC zJaildir_NAME[] = "JAILDIR"; tSCC zJaildir_Name[] = "jaildir"; #define JAILDIR_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Interface option description: @@ -194,7 +195,7 @@ tSCC zInterfaceText[] = tSCC zInterface_NAME[] = "INTERFACE"; tSCC zInterface_Name[] = "interface"; #define INTERFACE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Keyfile option description: @@ -204,7 +205,7 @@ tSCC zKeyfileText[] = tSCC zKeyfile_NAME[] = "KEYFILE"; tSCC zKeyfile_Name[] = "keyfile"; #define KEYFILE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Logfile option description: @@ -214,7 +215,7 @@ tSCC zLogfileText[] = tSCC zLogfile_NAME[] = "LOGFILE"; tSCC zLogfile_Name[] = "logfile"; #define LOGFILE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Novirtualips option description: @@ -269,7 +270,7 @@ tSCC zPidfileText[] = tSCC zPidfile_NAME[] = "PIDFILE"; tSCC zPidfile_Name[] = "pidfile"; #define PIDFILE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Priority option description: @@ -279,7 +280,7 @@ tSCC zPriorityText[] = tSCC zPriority_NAME[] = "PRIORITY"; tSCC zPriority_Name[] = "priority"; #define PRIORITY_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* * Quit option description: @@ -298,7 +299,7 @@ tSCC zPropagationdelayText[] = tSCC zPropagationdelay_NAME[] = "PROPAGATIONDELAY"; tSCC zPropagationdelay_Name[] = "propagationdelay"; #define PROPAGATIONDELAY_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Updateinterval option description: @@ -308,7 +309,7 @@ tSCC zUpdateintervalText[] = tSCC zUpdateinterval_NAME[] = "UPDATEINTERVAL"; tSCC zUpdateinterval_Name[] = "updateinterval"; #define UPDATEINTERVAL_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* * Statsdir option description: @@ -318,7 +319,7 @@ tSCC zStatsdirText[] = tSCC zStatsdir_NAME[] = "STATSDIR"; tSCC zStatsdir_Name[] = "statsdir"; #define STATSDIR_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Trustedkey option description: @@ -328,7 +329,7 @@ tSCC zTrustedkeyText[] = tSCC zTrustedkey_NAME[] = "TRUSTEDKEY"; tSCC zTrustedkey_Name[] = "trustedkey"; #define TRUSTEDKEY_FLAGS (OPTST_DISABLED | OPTST_STACKED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * User option description: @@ -338,7 +339,7 @@ tSCC zUserText[] = tSCC zUser_NAME[] = "USER"; tSCC zUser_Name[] = "user"; #define USER_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Var option description: @@ -348,7 +349,7 @@ tSCC zVarText[] = tSCC zVar_NAME[] = "VAR"; tSCC zVar_Name[] = "var"; #define VAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Dvar option description: @@ -358,7 +359,7 @@ tSCC zDvarText[] = tSCC zDvar_NAME[] = "DVAR"; tSCC zDvar_Name[] = "dvar"; #define DVAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Slew option description: @@ -368,7 +369,7 @@ tSCC zSlewText[] = tSCC zSlew_NAME[] = "SLEW"; tSCC zSlew_Name[] = "slew"; #define SLEW_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Help/More_Help/Version option descriptions: @@ -451,7 +452,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ IPV4_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -463,7 +464,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ INDEX_OPT_IPV4, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ IPV6_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -475,7 +476,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ AUTHREQ_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aAuthreqCantList, /* option proc */ NULL, @@ -487,7 +488,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ AUTHNOREQ_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aAuthnoreqCantList, /* option proc */ NULL, @@ -499,7 +500,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ BCASTSYNC_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -511,7 +512,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ CONFIGFILE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -523,7 +524,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ DEBUG_LEVEL_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -535,7 +536,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ SET_DEBUG_LEVEL_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ SET_DEBUG_LEVEL_OPT_PROC, @@ -547,7 +548,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ DRIFTFILE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -559,7 +560,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PANICGATE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -571,7 +572,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ JAILDIR_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -583,7 +584,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ INTERFACE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, @@ -595,7 +596,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ KEYFILE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -607,7 +608,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ LOGFILE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -619,7 +620,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NOVIRTUALIPS_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -631,7 +632,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ MODIFYMMTIMER_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -643,7 +644,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NOFORK_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -655,7 +656,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NICE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -667,7 +668,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PIDFILE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -679,7 +680,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PRIORITY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionNumericVal, @@ -691,7 +692,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ QUIT_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -703,7 +704,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PROPAGATIONDELAY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -715,7 +716,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ UPDATEINTERVAL_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionNumericVal, @@ -727,7 +728,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ STATSDIR_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -739,7 +740,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ TRUSTEDKEY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, @@ -751,7 +752,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ USER_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -763,7 +764,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ VAR_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, @@ -775,7 +776,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ DVAR_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, @@ -787,7 +788,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SLEW_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -800,7 +801,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ DOVERPROC, @@ -812,7 +813,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_IMM, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ doUsageOpt, @@ -824,7 +825,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_IMM, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionPagedUsage, @@ -837,7 +838,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -850,7 +851,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ OPTST_DISABLE_IMM | \ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING), 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionLoadOpt, @@ -864,7 +865,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPD"; tSCC zUsageTitle[] = -"ntpd - NTP daemon program - Ver. 4.2.3p49\n\ +"ntpd - NTP daemon program - Ver. 4.2.3p50\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -971,11 +972,11 @@ main( int argc, char** argv ) #include #include -static char* AO_gettext( const char* pz ); +static char* AO_gettext( char const* pz ); static void coerce_it(void** s); static char* -AO_gettext( const char* pz ) +AO_gettext( char const* pz ) { char* pzRes; if (pz == NULL) diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 1c8713bcb..c34e82483 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 September 21, 2006 at 07:34:21 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:20:43 AM EDT * From the definitions ntpd-opts.def * and the template file options */ @@ -88,8 +88,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 34 -#define NTPD_VERSION "4.2.3p49" -#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.3p49" +#define NTPD_VERSION "4.2.3p50" +#define NTPD_FULL_VERSION "ntpd - NTP daemon program - Ver. 4.2.3p50" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -98,7 +98,7 @@ typedef enum { */ #define DESC(n) ntpdOptions.pOptDesc[INDEX_OPT_ ## n] #define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) -#define OPT_ARG(n) (DESC(n).pzLastArg) +#define OPT_ARG(n) (DESC(n).optArg.argString) #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))) @@ -295,11 +295,11 @@ typedef enum { #define VALUE_OPT_NICE 'N' #define VALUE_OPT_PIDFILE 'p' #define VALUE_OPT_PRIORITY 'P' -#define OPT_VALUE_PRIORITY (*(unsigned long*)(&DESC(PRIORITY).pzLastArg)) +#define OPT_VALUE_PRIORITY (DESC(PRIORITY).optArg.argInt) #define VALUE_OPT_QUIT 'q' #define VALUE_OPT_PROPAGATIONDELAY 'r' #define VALUE_OPT_UPDATEINTERVAL 'U' -#define OPT_VALUE_UPDATEINTERVAL (*(unsigned long*)(&DESC(UPDATEINTERVAL).pzLastArg)) +#define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt) #define VALUE_OPT_STATSDIR 's' #define VALUE_OPT_TRUSTEDKEY 't' #define VALUE_OPT_USER 'u' @@ -315,7 +315,7 @@ typedef enum { #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT; \ DESC(SAVE_OPTS).fOptState |= OPTST_SET; \ - DESC(SAVE_OPTS).pzLastArg = (const char*)(a) ) + DESC(SAVE_OPTS).optArg.argString = (char const*)(a) ) /* * Interface defines not associated with particular options */ @@ -326,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 311 */ +/* extracted from opthead near line 312 */ /* * * * * * * @@ -341,7 +341,7 @@ extern tOptions ntpdOptions; #ifndef _ # if ENABLE_NLS # include - static inline char* aoGetsText( const char* pz ) { + static inline char* aoGetsText( char const* pz ) { if (pz == NULL) return NULL; return (char*)gettext( pz ); } diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 857e372c3..83c23d6e7 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 September 21, 2006 at 07:34:24 AM EDT +# It has been AutoGen-ed Sunday September 24, 2006 at 05:20:47 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 e6bb3873d..d7ae7c4d5 100644 --- a/ntpd/ntpd.1 +++ b/ntpd/ntpd.1 @@ -1,7 +1,7 @@ -.TH NTPD 1 2006-09-21 "( 4.2.3p49)" "Programmer's Manual" +.TH NTPD 1 2006-09-24 "( 4.2.3p50)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpd.1) .\" -.\" It has been AutoGen-ed Thursday September 21, 2006 at 07:34:23 AM EDT +.\" It has been AutoGen-ed Sunday September 24, 2006 at 05:20:45 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 f953f433e..f97b4c0c9 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 September 21, 2006 at 07:34:26 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:20:49 AM EDT * From the definitions ntpdsim-opts.def * and the template file options */ @@ -24,6 +24,7 @@ */ +#include #define OPTION_CODE_COMPILE 1 #include "ntpdsim-opts.h" @@ -118,7 +119,7 @@ tSCC zSimbroadcastdelayText[] = tSCC zSimbroadcastdelay_NAME[] = "SIMBROADCASTDELAY"; tSCC zSimbroadcastdelay_Name[] = "simbroadcastdelay"; #define SIMBROADCASTDELAY_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Configfile option description: @@ -128,7 +129,7 @@ tSCC zConfigfileText[] = tSCC zConfigfile_NAME[] = "CONFIGFILE"; tSCC zConfigfile_Name[] = "configfile"; #define CONFIGFILE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Phasenoise option description: @@ -138,7 +139,7 @@ tSCC zPhasenoiseText[] = tSCC zPhasenoise_NAME[] = "PHASENOISE"; tSCC zPhasenoise_Name[] = "phasenoise"; #define PHASENOISE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Debug_Level option description: @@ -167,7 +168,7 @@ tSCC zSet_Debug_LevelText[] = tSCC zSet_Debug_Level_NAME[] = "SET_DEBUG_LEVEL"; tSCC zSet_Debug_Level_Name[] = "set-debug-level"; #define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Set_Debug_Level */ #define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT @@ -185,7 +186,7 @@ tSCC zDriftfileText[] = tSCC zDriftfile_NAME[] = "DRIFTFILE"; tSCC zDriftfile_Name[] = "driftfile"; #define DRIFTFILE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Panicgate option description: @@ -204,7 +205,7 @@ tSCC zSimslewText[] = tSCC zSimslew_NAME[] = "SIMSLEW"; tSCC zSimslew_Name[] = "simslew"; #define SIMSLEW_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Jaildir option description: @@ -214,7 +215,7 @@ tSCC zJaildirText[] = tSCC zJaildir_NAME[] = "JAILDIR"; tSCC zJaildir_Name[] = "jaildir"; #define JAILDIR_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Interface option description: @@ -224,7 +225,7 @@ tSCC zInterfaceText[] = tSCC zInterface_NAME[] = "INTERFACE"; tSCC zInterface_Name[] = "interface"; #define INTERFACE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Keyfile option description: @@ -234,7 +235,7 @@ tSCC zKeyfileText[] = tSCC zKeyfile_NAME[] = "KEYFILE"; tSCC zKeyfile_Name[] = "keyfile"; #define KEYFILE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Logfile option description: @@ -244,7 +245,7 @@ tSCC zLogfileText[] = tSCC zLogfile_NAME[] = "LOGFILE"; tSCC zLogfile_Name[] = "logfile"; #define LOGFILE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Novirtualips option description: @@ -299,7 +300,7 @@ tSCC zServertimeText[] = tSCC zServertime_NAME[] = "SERVERTIME"; tSCC zServertime_Name[] = "servertime"; #define SERVERTIME_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Pidfile option description: @@ -309,7 +310,7 @@ tSCC zPidfileText[] = tSCC zPidfile_NAME[] = "PIDFILE"; tSCC zPidfile_Name[] = "pidfile"; #define PIDFILE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Priority option description: @@ -319,7 +320,7 @@ tSCC zPriorityText[] = tSCC zPriority_NAME[] = "PRIORITY"; tSCC zPriority_Name[] = "priority"; #define PRIORITY_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* * Quit option description: @@ -338,7 +339,7 @@ tSCC zPropagationdelayText[] = tSCC zPropagationdelay_NAME[] = "PROPAGATIONDELAY"; tSCC zPropagationdelay_Name[] = "propagationdelay"; #define PROPAGATIONDELAY_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Updateinterval option description: @@ -348,7 +349,7 @@ tSCC zUpdateintervalText[] = tSCC zUpdateinterval_NAME[] = "UPDATEINTERVAL"; tSCC zUpdateinterval_Name[] = "updateinterval"; #define UPDATEINTERVAL_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* * Statsdir option description: @@ -358,7 +359,7 @@ tSCC zStatsdirText[] = tSCC zStatsdir_NAME[] = "STATSDIR"; tSCC zStatsdir_Name[] = "statsdir"; #define STATSDIR_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Endsimtime option description: @@ -368,7 +369,7 @@ tSCC zEndsimtimeText[] = tSCC zEndsimtime_NAME[] = "ENDSIMTIME"; tSCC zEndsimtime_Name[] = "endsimtime"; #define ENDSIMTIME_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Trustedkey option description: @@ -378,7 +379,7 @@ tSCC zTrustedkeyText[] = tSCC zTrustedkey_NAME[] = "TRUSTEDKEY"; tSCC zTrustedkey_Name[] = "trustedkey"; #define TRUSTEDKEY_FLAGS (OPTST_DISABLED | OPTST_STACKED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Freqerr option description: @@ -388,7 +389,7 @@ tSCC zFreqerrText[] = tSCC zFreqerr_NAME[] = "FREQERR"; tSCC zFreqerr_Name[] = "freqerr"; #define FREQERR_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Walknoise option description: @@ -398,7 +399,7 @@ tSCC zWalknoiseText[] = tSCC zWalknoise_NAME[] = "WALKNOISE"; tSCC zWalknoise_Name[] = "walknoise"; #define WALKNOISE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * User option description: @@ -408,7 +409,7 @@ tSCC zUserText[] = tSCC zUser_NAME[] = "USER"; tSCC zUser_Name[] = "user"; #define USER_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Var option description: @@ -418,7 +419,7 @@ tSCC zVarText[] = tSCC zVar_NAME[] = "VAR"; tSCC zVar_Name[] = "var"; #define VAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Dvar option description: @@ -428,7 +429,7 @@ tSCC zDvarText[] = tSCC zDvar_NAME[] = "DVAR"; tSCC zDvar_Name[] = "dvar"; #define DVAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Slew option description: @@ -438,7 +439,7 @@ tSCC zSlewText[] = tSCC zSlew_NAME[] = "SLEW"; tSCC zSlew_Name[] = "slew"; #define SLEW_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Ndelay option description: @@ -448,7 +449,7 @@ tSCC zNdelayText[] = tSCC zNdelay_NAME[] = "NDELAY"; tSCC zNdelay_Name[] = "ndelay"; #define NDELAY_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Pdelay option description: @@ -458,7 +459,7 @@ tSCC zPdelayText[] = tSCC zPdelay_NAME[] = "PDELAY"; tSCC zPdelay_Name[] = "pdelay"; #define PDELAY_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Help/More_Help/Version option descriptions: @@ -541,7 +542,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ IPV4_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -553,7 +554,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ INDEX_OPT_IPV4, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ IPV6_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -565,7 +566,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ AUTHREQ_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aAuthreqCantList, /* option proc */ NULL, @@ -577,7 +578,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ AUTHNOREQ_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aAuthnoreqCantList, /* option proc */ NULL, @@ -589,7 +590,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ BCASTSYNC_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -601,7 +602,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SIMBROADCASTDELAY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -613,7 +614,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ CONFIGFILE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -625,7 +626,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PHASENOISE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -637,7 +638,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ DEBUG_LEVEL_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -649,7 +650,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ SET_DEBUG_LEVEL_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ SET_DEBUG_LEVEL_OPT_PROC, @@ -661,7 +662,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ DRIFTFILE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -673,7 +674,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PANICGATE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -685,7 +686,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SIMSLEW_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -697,7 +698,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ JAILDIR_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -709,7 +710,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ INTERFACE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, @@ -721,7 +722,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ KEYFILE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -733,7 +734,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ LOGFILE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -745,7 +746,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NOVIRTUALIPS_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -757,7 +758,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ MODIFYMMTIMER_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -769,7 +770,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NOFORK_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -781,7 +782,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NICE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -793,7 +794,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SERVERTIME_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -805,7 +806,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PIDFILE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -817,7 +818,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PRIORITY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionNumericVal, @@ -829,7 +830,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ QUIT_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -841,7 +842,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PROPAGATIONDELAY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -853,7 +854,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ UPDATEINTERVAL_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionNumericVal, @@ -865,7 +866,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ STATSDIR_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -877,7 +878,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ ENDSIMTIME_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -889,7 +890,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ TRUSTEDKEY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, @@ -901,7 +902,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ FREQERR_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -913,7 +914,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ WALKNOISE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -925,7 +926,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ USER_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -937,7 +938,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ VAR_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, @@ -949,7 +950,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ DVAR_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, @@ -961,7 +962,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SLEW_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -973,7 +974,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NDELAY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -985,7 +986,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PDELAY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -998,7 +999,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ DOVERPROC, @@ -1010,7 +1011,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_IMM, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ doUsageOpt, @@ -1022,7 +1023,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_IMM, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionPagedUsage, @@ -1035,7 +1036,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -1048,7 +1049,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ OPTST_DISABLE_IMM | \ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING), 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionLoadOpt, @@ -1062,7 +1063,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDSIM"; tSCC zUsageTitle[] = -"ntpdsim - NTP daemon simulation program - Ver. 4.2.3p49\n\ +"ntpdsim - NTP daemon simulation program - Ver. 4.2.3p50\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -1169,11 +1170,11 @@ main( int argc, char** argv ) #include #include -static char* AO_gettext( const char* pz ); +static char* AO_gettext( char const* pz ); static void coerce_it(void** s); static char* -AO_gettext( const char* pz ) +AO_gettext( char const* pz ) { char* pzRes; if (pz == NULL) diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index 5f8cd60c6..8feb30576 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 September 21, 2006 at 07:34:25 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:20:48 AM EDT * From the definitions ntpdsim-opts.def * and the template file options */ @@ -97,8 +97,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 43 -#define NTPDSIM_VERSION "4.2.3p49" -#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.3p49" +#define NTPDSIM_VERSION "4.2.3p50" +#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.3p50" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -107,7 +107,7 @@ typedef enum { */ #define DESC(n) ntpdsimOptions.pOptDesc[INDEX_OPT_ ## n] #define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) -#define OPT_ARG(n) (DESC(n).pzLastArg) +#define OPT_ARG(n) (DESC(n).optArg.argString) #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))) @@ -353,11 +353,11 @@ typedef enum { #define VALUE_OPT_SERVERTIME 'O' #define VALUE_OPT_PIDFILE 'p' #define VALUE_OPT_PRIORITY 'P' -#define OPT_VALUE_PRIORITY (*(unsigned long*)(&DESC(PRIORITY).pzLastArg)) +#define OPT_VALUE_PRIORITY (DESC(PRIORITY).optArg.argInt) #define VALUE_OPT_QUIT 'q' #define VALUE_OPT_PROPAGATIONDELAY 'r' #define VALUE_OPT_UPDATEINTERVAL 'U' -#define OPT_VALUE_UPDATEINTERVAL (*(unsigned long*)(&DESC(UPDATEINTERVAL).pzLastArg)) +#define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt) #define VALUE_OPT_STATSDIR 's' #define VALUE_OPT_ENDSIMTIME 'S' #define VALUE_OPT_TRUSTEDKEY 't' @@ -378,7 +378,7 @@ typedef enum { #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT; \ DESC(SAVE_OPTS).fOptState |= OPTST_SET; \ - DESC(SAVE_OPTS).pzLastArg = (const char*)(a) ) + DESC(SAVE_OPTS).optArg.argString = (char const*)(a) ) /* * Interface defines not associated with particular options */ @@ -389,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 311 */ +/* extracted from opthead near line 312 */ /* * * * * * * @@ -404,7 +404,7 @@ extern tOptions ntpdsimOptions; #ifndef _ # if ENABLE_NLS # include - static inline char* aoGetsText( const char* pz ) { + static inline char* aoGetsText( char const* pz ) { if (pz == NULL) return NULL; return (char*)gettext( pz ); } diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi index 1f2e81238..eabddf4ee 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 September 21, 2006 at 07:34:29 AM EDT +# It has been AutoGen-ed Sunday September 24, 2006 at 05:20: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 6f51de85d..0db142d2f 100644 --- a/ntpd/ntpdsim.1 +++ b/ntpd/ntpdsim.1 @@ -1,7 +1,7 @@ -.TH NTPDSIM 1 2006-09-21 "( 4.2.3p49)" "Programmer's Manual" +.TH NTPDSIM 1 2006-09-24 "( 4.2.3p50)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpdsim.1) .\" -.\" It has been AutoGen-ed Thursday September 21, 2006 at 07:34:28 AM EDT +.\" It has been AutoGen-ed Sunday September 24, 2006 at 05:20:51 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 bd17399f0..c3fb186e6 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 September 21, 2006 at 07:40:51 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:27:21 AM EDT * From the definitions ntpdc-opts.def * and the template file options */ @@ -24,6 +24,7 @@ */ +#include #define OPTION_CODE_COMPILE 1 #include "ntpdc-opts.h" @@ -83,7 +84,7 @@ tSCC zCommandText[] = tSCC zCommand_NAME[] = "COMMAND"; tSCC zCommand_Name[] = "command"; #define COMMAND_FLAGS (OPTST_DISABLED | OPTST_STACKED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * Listpeers option description with @@ -167,7 +168,7 @@ tSCC zSet_Debug_LevelText[] = tSCC zSet_Debug_Level_NAME[] = "SET_DEBUG_LEVEL"; tSCC zSet_Debug_Level_Name[] = "set-debug-level"; #define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Set_Debug_Level */ #define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT @@ -266,7 +267,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ IPV4_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -278,7 +279,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ INDEX_OPT_IPV4, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ IPV6_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -290,7 +291,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ COMMAND_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, @@ -302,7 +303,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ LISTPEERS_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aListpeersCantList, /* option proc */ NULL, @@ -314,7 +315,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PEERS_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aPeersCantList, /* option proc */ NULL, @@ -326,7 +327,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SHOWPEERS_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aShowpeersCantList, /* option proc */ NULL, @@ -338,7 +339,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ INTERACTIVE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aInteractiveCantList, /* option proc */ NULL, @@ -350,7 +351,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ DEBUG_LEVEL_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -362,7 +363,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ SET_DEBUG_LEVEL_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ SET_DEBUG_LEVEL_OPT_PROC, @@ -374,7 +375,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NUMERIC_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -387,7 +388,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ DOVERPROC, @@ -399,7 +400,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_IMM, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ doUsageOpt, @@ -411,7 +412,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_IMM, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionPagedUsage, @@ -424,7 +425,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -437,7 +438,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ OPTST_DISABLE_IMM | \ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING), 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionLoadOpt, @@ -451,7 +452,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPDC"; tSCC zUsageTitle[] = -"ntpdc - vendor-specific NTP query program - Ver. 4.2.3p49\n\ +"ntpdc - vendor-specific NTP query program - Ver. 4.2.3p50\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -573,11 +574,11 @@ main( int argc, char** argv ) #include #include -static char* AO_gettext( const char* pz ); +static char* AO_gettext( char const* pz ); static void coerce_it(void** s); static char* -AO_gettext( const char* pz ) +AO_gettext( char const* pz ) { char* pzRes; if (pz == NULL) diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index c1f1c61de..d6bca712a 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 September 21, 2006 at 07:40:50 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:27:20 AM EDT * From the definitions ntpdc-opts.def * and the template file options */ @@ -69,8 +69,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.3p49" -#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.3p49" +#define NTPDC_VERSION "4.2.3p50" +#define NTPDC_FULL_VERSION "ntpdc - vendor-specific NTP query program - Ver. 4.2.3p50" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -79,7 +79,7 @@ typedef enum { */ #define DESC(n) ntpdcOptions.pOptDesc[INDEX_OPT_ ## n] #define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) -#define OPT_ARG(n) (DESC(n).pzLastArg) +#define OPT_ARG(n) (DESC(n).optArg.argString) #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))) @@ -178,7 +178,7 @@ typedef enum { #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT; \ DESC(SAVE_OPTS).fOptState |= OPTST_SET; \ - DESC(SAVE_OPTS).pzLastArg = (const char*)(a) ) + DESC(SAVE_OPTS).optArg.argString = (char const*)(a) ) /* * Interface defines not associated with particular options */ @@ -189,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 311 */ +/* extracted from opthead near line 312 */ /* * * * * * * @@ -204,7 +204,7 @@ extern tOptions ntpdcOptions; #ifndef _ # if ENABLE_NLS # include - static inline char* aoGetsText( const char* pz ) { + static inline char* aoGetsText( char const* pz ) { if (pz == NULL) return NULL; return (char*)gettext( pz ); } diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 2848f161f..8ffd01961 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 September 21, 2006 at 07:40:53 AM EDT +# It has been AutoGen-ed Sunday September 24, 2006 at 05:27:23 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 20a538514..1c91d7ac4 100644 --- a/ntpdc/ntpdc.1 +++ b/ntpdc/ntpdc.1 @@ -1,7 +1,7 @@ -.TH NTPDC 1 2006-09-21 "( 4.2.3p49)" "Programmer's Manual" +.TH NTPDC 1 2006-09-24 "( 4.2.3p50)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpdc.1) .\" -.\" It has been AutoGen-ed Thursday September 21, 2006 at 07:40:52 AM EDT +.\" It has been AutoGen-ed Sunday September 24, 2006 at 05:27:22 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 e5ab15634..00786f14a 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 Sunday September 24, 2006 at 02:18:34 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:27:51 AM EDT * From the definitions ntpq-opts.def * and the template file options */ @@ -36,7 +36,7 @@ tSCC zCopyright[] = "ntpq copyright (c) 1970-2006 ntp.org, all rights reserved"; tSCC zCopyrightNotice[] = -/* extracted from /backroom/ntp-dev/include/copyright.def near line 8 */ +/* extracted from ../include/copyright.def near line 8 */ "see html/copyright.html"; extern tUsageProc optionUsage; @@ -400,7 +400,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "NTPQ"; tSCC zUsageTitle[] = -"ntpq - standard NTP query program - Ver. 4.2.3p49\n\ +"ntpq - standard NTP query program - Ver. 4.2.3p50\n\ USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h index e18d8b0c8..081b0ab04 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 Sunday September 24, 2006 at 02:18:34 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:27:50 AM EDT * From the definitions ntpq-opts.def * and the template file options */ @@ -67,8 +67,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 13 -#define NTPQ_VERSION "4.2.3p49" -#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.3p49" +#define NTPQ_VERSION "4.2.3p50" +#define NTPQ_FULL_VERSION "ntpq - standard NTP query program - Ver. 4.2.3p50" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi index 595c93990..33f6a0fc2 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 Friday September 22, 2006 at 08:21:20 PM EDT +# It has been AutoGen-ed Sunday September 24, 2006 at 05:27:53 AM EDT # From the definitions ntpq-opts.def # and the template file aginfo.tpl @end ignore @@ -80,9 +80,9 @@ or by a single hyphen and the flag character. The following option preset mechanisms are supported: - reading file /users/stenn/.ntprc - - reading file /deacon/backroom/ntp-dev/ntpq/.ntprc + - reading file /deacon/backroom/snaps/ntp-dev/ntpq/.ntprc - reading file /users/stenn/.ntprc - - reading file /deacon/backroom/ntp-dev/ntpq/.ntprc + - reading file /deacon/backroom/snaps/ntp-dev/ntpq/.ntprc - examining environment variables named NTPQ_* The diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1 index e57e35bed..dc4dd7003 100644 --- a/ntpq/ntpq.1 +++ b/ntpq/ntpq.1 @@ -1,7 +1,7 @@ -.TH NTPQ 1 2006-09-22 "( 4.2.3p49)" "Programmer's Manual" +.TH NTPQ 1 2006-09-24 "( 4.2.3p50)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntpq.1) .\" -.\" It has been AutoGen-ed Friday September 22, 2006 at 08:21:19 PM EDT +.\" It has been AutoGen-ed Sunday September 24, 2006 at 05:27:52 AM EDT .\" From the definitions ntpq-opts.def .\" and the template file agman1.tpl .\" diff --git a/packageinfo.sh b/packageinfo.sh index 818f0b78f..21b3497db 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=49 +point=50 # Special. Normally unused. A suffix. #special=ag special= diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c index 6aa851697..df7a1c2d3 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 September 21, 2006 at 07:41:51 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:28:21 AM EDT * From the definitions sntp-opts.def * and the template file options */ @@ -103,6 +103,7 @@ */ +#include #define OPTION_CODE_COMPILE 1 #include "sntp-opts.h" @@ -332,7 +333,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ IPV4_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -344,7 +345,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ INDEX_OPT_IPV4, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ IPV6_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -356,7 +357,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ NORMALVERBOSE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aNormalverboseCantList, /* option proc */ NULL, @@ -368,7 +369,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ EXTRAVERBOSE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aExtraverboseCantList, /* option proc */ NULL, @@ -380,7 +381,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ MEGAVERBOSE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aMegaverboseCantList, /* option proc */ NULL, @@ -392,7 +393,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SETTIMEOFDAY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aSettimeofdayCantList, /* option proc */ NULL, @@ -404,7 +405,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ ADJTIME_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aAdjtimeCantList, /* option proc */ NULL, @@ -417,7 +418,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ DOVERPROC, @@ -429,7 +430,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_IMM, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ doUsageOpt, @@ -441,7 +442,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_IMM, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionPagedUsage, @@ -454,7 +455,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -467,7 +468,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ OPTST_DISABLE_IMM | \ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING), 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionLoadOpt, @@ -481,7 +482,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { */ tSCC zPROGNAME[] = "SNTP"; tSCC zUsageTitle[] = -"sntp - standard SNTP program - Ver. 4.2.3p49\n\ +"sntp - standard SNTP program - Ver. 4.2.3p50\n\ USAGE: %s [ - | -- ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -577,11 +578,11 @@ main( int argc, char** argv ) #include #include -static char* AO_gettext( const char* pz ); +static char* AO_gettext( char const* pz ); static void coerce_it(void** s); static char* -AO_gettext( const char* pz ) +AO_gettext( char const* pz ) { char* pzRes; if (pz == NULL) diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h index 6e70a9fe6..f9d727252 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 September 21, 2006 at 07:41:50 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:28:20 AM EDT * From the definitions sntp-opts.def * and the template file options */ @@ -145,8 +145,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 12 -#define SNTP_VERSION "4.2.3p49" -#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.3p49" +#define SNTP_VERSION "4.2.3p50" +#define SNTP_FULL_VERSION "sntp - standard SNTP program - Ver. 4.2.3p50" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -155,7 +155,7 @@ typedef enum { */ #define DESC(n) sntpOptions.pOptDesc[INDEX_OPT_ ## n] #define HAVE_OPT(n) (! UNUSED_OPT(& DESC(n))) -#define OPT_ARG(n) (DESC(n).pzLastArg) +#define OPT_ARG(n) (DESC(n).optArg.argString) #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))) @@ -232,7 +232,7 @@ typedef enum { #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT; \ DESC(SAVE_OPTS).fOptState |= OPTST_SET; \ - DESC(SAVE_OPTS).pzLastArg = (const char*)(a) ) + DESC(SAVE_OPTS).optArg.argString = (char const*)(a) ) /* * Interface defines not associated with particular options */ @@ -243,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 311 */ +/* extracted from opthead near line 312 */ /* * * * * * * @@ -258,7 +258,7 @@ extern tOptions sntpOptions; #ifndef _ # if ENABLE_NLS # include - static inline char* aoGetsText( const char* pz ) { + static inline char* aoGetsText( char const* pz ) { if (pz == NULL) return NULL; return (char*)gettext( pz ); } diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi index fd202e72d..22effe58e 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 September 21, 2006 at 07:41:53 AM EDT +# It has been AutoGen-ed Sunday September 24, 2006 at 05:28:23 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 3b31f35a3..adfe831c3 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 September 21, 2006 at 07:42:00 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:29:37 AM EDT * From the definitions ntp-keygen-opts.def * and the template file options */ @@ -24,8 +24,8 @@ */ -#include #include +#include #define OPTION_CODE_COMPILE 1 #include "ntp-keygen-opts.h" @@ -68,7 +68,7 @@ tSCC zCertificateText[] = tSCC zCertificate_NAME[] = "CERTIFICATE"; tSCC zCertificate_Name[] = "certificate"; #define CERTIFICATE_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Certificate */ #define VALUE_OPT_CERTIFICATE NO_EQUIVALENT @@ -105,7 +105,7 @@ tSCC zSet_Debug_LevelText[] = tSCC zSet_Debug_Level_NAME[] = "SET_DEBUG_LEVEL"; tSCC zSet_Debug_Level_Name[] = "set-debug-level"; #define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Set_Debug_Level */ #define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT @@ -241,7 +241,7 @@ tSCC zModulusText[] = tSCC zModulus_NAME[] = "MODULUS"; tSCC zModulus_Name[] = "modulus"; #define MODULUS_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) #else /* disable Modulus */ #define VALUE_OPT_MODULUS NO_EQUIVALENT @@ -278,7 +278,7 @@ tSCC zPvt_PasswdText[] = tSCC zPvt_Passwd_NAME[] = "PVT_PASSWD"; tSCC zPvt_Passwd_Name[] = "pvt-passwd"; #define PVT_PASSWD_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Pvt_Passwd */ #define VALUE_OPT_PVT_PASSWD NO_EQUIVALENT @@ -297,7 +297,7 @@ tSCC zGet_Pvt_PasswdText[] = tSCC zGet_Pvt_Passwd_NAME[] = "GET_PVT_PASSWD"; tSCC zGet_Pvt_Passwd_Name[] = "get-pvt-passwd"; #define GET_PVT_PASSWD_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Get_Pvt_Passwd */ #define VALUE_OPT_GET_PVT_PASSWD NO_EQUIVALENT @@ -316,7 +316,7 @@ tSCC zSign_KeyText[] = tSCC zSign_Key_NAME[] = "SIGN_KEY"; tSCC zSign_Key_Name[] = "sign-key"; #define SIGN_KEY_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Sign_Key */ #define VALUE_OPT_SIGN_KEY NO_EQUIVALENT @@ -335,7 +335,7 @@ tSCC zSubject_NameText[] = tSCC zSubject_Name_NAME[] = "SUBJECT_NAME"; tSCC zSubject_Name_Name[] = "subject-name"; #define SUBJECT_NAME_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #else /* disable Subject_Name */ #define VALUE_OPT_SUBJECT_NAME NO_EQUIVALENT @@ -372,7 +372,7 @@ tSCC zMv_ParamsText[] = tSCC zMv_Params_NAME[] = "MV_PARAMS"; tSCC zMv_Params_Name[] = "mv-params"; #define MV_PARAMS_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) #else /* disable Mv_Params */ #define VALUE_OPT_MV_PARAMS NO_EQUIVALENT @@ -391,7 +391,7 @@ tSCC zMv_KeysText[] = tSCC zMv_Keys_NAME[] = "MV_KEYS"; tSCC zMv_Keys_Name[] = "mv-keys"; #define MV_KEYS_FLAGS (OPTST_DISABLED \ - | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) + | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) #else /* disable Mv_Keys */ #define VALUE_OPT_MV_KEYS NO_EQUIVALENT @@ -496,7 +496,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ CERTIFICATE_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -508,7 +508,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ DEBUG_LEVEL_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -520,7 +520,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ SET_DEBUG_LEVEL_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ SET_DEBUG_LEVEL_OPT_PROC, @@ -532,7 +532,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ ID_KEY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -544,7 +544,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ GQ_PARAMS_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -556,7 +556,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ GQ_KEYS_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -568,7 +568,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ HOST_KEY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -580,7 +580,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ IFFKEY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -592,7 +592,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ ISSUER_NAME_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -604,7 +604,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ MD5KEY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -616,7 +616,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ MODULUS_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ doOptModulus, @@ -628,7 +628,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PVT_CERT_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -640,7 +640,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PVT_PASSWD_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -652,7 +652,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ GET_PVT_PASSWD_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -664,7 +664,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SIGN_KEY_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -676,7 +676,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SUBJECT_NAME_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -688,7 +688,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ TRUSTED_CERT_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -700,7 +700,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ MV_PARAMS_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionNumericVal, @@ -712,7 +712,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ MV_KEYS_FLAGS, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionNumericVal, @@ -725,7 +725,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ DOVERPROC, @@ -737,7 +737,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_IMM, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ doUsageOpt, @@ -749,7 +749,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_IMM, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionPagedUsage, @@ -762,7 +762,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | OPTST_ARG_OPTIONAL, 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, @@ -775,7 +775,7 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ OPTST_DISABLE_IMM | \ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING), 0, - /* last opt argumnt */ NULL, + /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionLoadOpt, @@ -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.3p49\n\ +"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p50\n\ USAGE: %s [ - [] | --[{=| }] ]...\n"; tSCC zRcName[] = ".ntprc"; tSCC* apzHomeList[] = { @@ -887,14 +887,14 @@ doOptModulus( { 256, 2048 } }; long val; int ix; - const char* pzIndent = "\t\t\t\t "; + char const* pzIndent = "\t\t\t\t "; extern FILE* option_usage_fp; if (pOptDesc == NULL) /* usage is requesting range list option_usage_fp has already been set */ goto emit_ranges; - val = atoi( pOptDesc->pzLastArg ); + val = atoi( pOptDesc->optArg.argString ); for (ix = 0; ix < 1; ix++) { if (val < rng[ix].rmin) continue; /* ranges need not be ordered. */ @@ -907,8 +907,8 @@ doOptModulus( } option_usage_fp = stderr; - fprintf( stderr, _("%s error: %s option value ``%s''is out of range.\n"), - pOptions->pzProgName, pOptDesc->pz_Name, pOptDesc->pzLastArg ); + fprintf(stderr, _("%s error: %s option value ``%s''is out of range.\n"), + pOptions->pzProgName, pOptDesc->pz_Name, pOptDesc->optArg.argString); pzIndent = "\t"; emit_ranges: @@ -922,7 +922,7 @@ doOptModulus( return; valid_return: - pOptDesc->pzLastArg = (char*)val; + pOptDesc->optArg.argString = (char*)val; } #endif /* defined OPENSSL */ @@ -951,11 +951,11 @@ main( int argc, char** argv ) #include #include -static char* AO_gettext( const char* pz ); +static char* AO_gettext( char const* pz ); static void coerce_it(void** s); static char* -AO_gettext( const char* pz ) +AO_gettext( char const* pz ) { char* pzRes; if (pz == NULL) diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h index d7b044ea6..d3e0444a1 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 September 21, 2006 at 07:41:59 AM EDT + * It has been AutoGen-ed Sunday September 24, 2006 at 05:29:37 AM EDT * From the definitions ntp-keygen-opts.def * and the template file options */ @@ -78,8 +78,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 24 -#define NTP_KEYGEN_VERSION "4.2.3p49" -#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p49" +#define NTP_KEYGEN_VERSION "4.2.3p50" +#define NTP_KEYGEN_FULL_VERSION "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p50" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -88,7 +88,7 @@ typedef enum { */ #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 OPT_ARG(n) (DESC(n).optArg.argString) #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))) @@ -237,7 +237,7 @@ typedef enum { #define VALUE_OPT_MD5KEY 'M' #ifdef OPENSSL #define VALUE_OPT_MODULUS 'm' -#define OPT_VALUE_MODULUS (*(unsigned long*)(&DESC(MODULUS).pzLastArg)) +#define OPT_VALUE_MODULUS (DESC(MODULUS).optArg.argInt) #endif /* OPENSSL */ #ifdef OPENSSL #define VALUE_OPT_PVT_CERT 'P' @@ -259,11 +259,11 @@ typedef enum { #endif /* OPENSSL */ #ifdef OPENSSL #define VALUE_OPT_MV_PARAMS 'V' -#define OPT_VALUE_MV_PARAMS (*(unsigned long*)(&DESC(MV_PARAMS).pzLastArg)) +#define OPT_VALUE_MV_PARAMS (DESC(MV_PARAMS).optArg.argInt) #endif /* OPENSSL */ #ifdef OPENSSL #define VALUE_OPT_MV_KEYS 'v' -#define OPT_VALUE_MV_KEYS (*(unsigned long*)(&DESC(MV_KEYS).pzLastArg)) +#define OPT_VALUE_MV_KEYS (DESC(MV_KEYS).optArg.argInt) #endif /* OPENSSL */ #define VALUE_OPT_VERSION 'v' @@ -274,7 +274,7 @@ typedef enum { #define SET_OPT_SAVE_OPTS(a) STMTS( \ DESC(SAVE_OPTS).fOptState &= OPTST_PERSISTENT; \ DESC(SAVE_OPTS).fOptState |= OPTST_SET; \ - DESC(SAVE_OPTS).pzLastArg = (const char*)(a) ) + DESC(SAVE_OPTS).optArg.argString = (char const*)(a) ) /* * Interface defines not associated with particular options */ @@ -285,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 311 */ +/* extracted from opthead near line 312 */ /* * * * * * * @@ -300,7 +300,7 @@ extern tOptions ntp_keygenOptions; #ifndef _ # if ENABLE_NLS # include - static inline char* aoGetsText( const char* pz ) { + static inline char* aoGetsText( char const* pz ) { if (pz == NULL) return NULL; return (char*)gettext( pz ); } diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi index 3cae5c9cc..3370841cc 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 September 21, 2006 at 07:42:02 AM EDT +# It has been AutoGen-ed Sunday September 24, 2006 at 05:29:39 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 6375c189e..c1f3ef5b8 100644 --- a/util/ntp-keygen.1 +++ b/util/ntp-keygen.1 @@ -1,7 +1,7 @@ -.TH NTP-KEYGEN 1 2006-09-21 "(ntp 4.2.3p49)" "Programmer's Manual" +.TH NTP-KEYGEN 1 2006-09-24 "(ntp 4.2.3p50)" "Programmer's Manual" .\" DO NOT EDIT THIS FILE (ntp-keygen.1) .\" -.\" It has been AutoGen-ed Thursday September 21, 2006 at 07:42:01 AM EDT +.\" It has been AutoGen-ed Sunday September 24, 2006 at 05:29:38 AM EDT .\" From the definitions ntp-keygen-opts.def .\" and the template file agman1.tpl .\"