From: Harlan Stenn Date: Tue, 8 May 2012 05:47:09 +0000 (+0000) Subject: autogen upgrade X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f28c5629437be8324898ae5e2bedd630f28ed409;p=thirdparty%2Fntp.git autogen upgrade bk: 4fa8b35dCtvsVetEh-98_pgon_kAiA --- diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi index 22b0f55542..ac27ccb146 100644 --- a/ntpd/invoke-ntpd.texi +++ b/ntpd/invoke-ntpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpd.texi) # -# It has been AutoGen-ed April 14, 2012 at 12:21:50 AM by AutoGen 5.16pre18 +# It has been AutoGen-ed April 17, 2012 at 02:12:45 AM by AutoGen 5.16pre23 # From the definitions ntpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -73,7 +73,7 @@ with a status code of 0. @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p272 +ntpd - NTP daemon program - Ver. 4.2.7p271 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c index 3f8f7064a7..40fa92d44d 100644 --- a/ntpd/ntpdsim-opts.c +++ b/ntpd/ntpdsim-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.c) * - * It has been AutoGen-ed February 22, 2011 at 12:29:00 AM by AutoGen 5.11.6 + * It has been AutoGen-ed May 1, 2012 at 09:18:07 AM by AutoGen 5.16pre31 * From the definitions ntpdsim-opts.def * and the template file options * - * Generated from AutoOpts 34:0:9 templates. + * Generated from AutoOpts 36:4:11 templates. * * AutoOpts is a copyrighted work. This source file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -15,35 +15,44 @@ * users discretion, the BSD license. See the AutoOpts and/or libopts sources * for details. * - * This source file is copyrighted and licensed under the following terms: + * The ntpdsim program is copyrighted and licensed + * under the following terms: * - * ntpdsim copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved + * Copyright (C) 1970-2012 The University of Delaware, all rights reserved. + * This is free software. It is licensed for use, modification and + * redistribution under the terms of the NTP License, copies of which + * can be seen at: + * + * * - * see html/copyright.html + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose with or without fee is hereby granted, + * provided that the above copyright notice appears in all copies and that + * both the copyright notice and this permission notice appear in + * supporting documentation, and that the name The University of Delaware not be used in + * advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. The University of Delaware makes no + * representations about the suitability this software for any purpose. It + * is provided "as is" without express or implied warranty. */ +#define OPTION_CODE_COMPILE 1 +#include "ntpdsim-opts.h" #include + #include #include #include -#define OPTION_CODE_COMPILE 1 -#include "ntpdsim-opts.h" - #ifdef __cplusplus extern "C" { #endif +extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ -tSCC zCopyright[] = - "ntpdsim copyright (c) 1970-2011 David L. Mills and/or others, all rights reserved" -/* extracted from copyright.def near line 8 */ -; -tSCC zCopyrightNotice[24] = -"see html/copyright.html"; - -extern tUsageProc optionUsage; +#define zCopyright (ntpdsim_opt_strs+0) +#define zLicenseDescrip (ntpdsim_opt_strs+317) /* * global included definitions @@ -57,429 +66,564 @@ extern tUsageProc optionUsage; #ifndef NULL # define NULL 0 #endif -#ifndef EXIT_SUCCESS -# define EXIT_SUCCESS 0 -#endif -#ifndef EXIT_FAILURE -# define EXIT_FAILURE 1 -#endif /* - * Ipv4 option description with + * ntpdsim option static const strings + */ +static char const ntpdsim_opt_strs[3123] = +/* 0 */ "ntpdsim 4.2.7p272\n" + "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n" + "This is free software. It is licensed for use, modification and\n" + "redistribution under the terms of the NTP License, copies of which\n" + "can be seen at:\n" + " \n" + " \n\0" +/* 317 */ "Permission to use, copy, modify, and distribute this software and its\n" + "documentation for any purpose with or without fee is hereby granted,\n" + "provided that the above copyright notice appears in all copies and that\n" + "both the copyright notice and this permission notice appear in supporting\n" + "documentation, and that the name The University of Delaware not be used in\n" + "advertising or publicity pertaining to distribution of the software without\n" + "specific, written prior permission. The University of Delaware makes no\n" + "representations about the suitability this software for any purpose. It is\n" + "provided \"as is\" without express or implied warranty.\n\0" +/* 957 */ "Force IPv4 DNS name resolution\0" +/* 988 */ "IPV4\0" +/* 993 */ "ipv4\0" +/* 998 */ "Force IPv6 DNS name resolution\0" +/* 1029 */ "IPV6\0" +/* 1034 */ "ipv6\0" +/* 1039 */ "Require crypto authentication\0" +/* 1069 */ "AUTHREQ\0" +/* 1077 */ "authreq\0" +/* 1085 */ "Do not require crypto authentication\0" +/* 1122 */ "AUTHNOREQ\0" +/* 1132 */ "authnoreq\0" +/* 1142 */ "Allow us to sync to broadcast servers\0" +/* 1180 */ "BCASTSYNC\0" +/* 1190 */ "bcastsync\0" +/* 1200 */ "configuration file name\0" +/* 1224 */ "CONFIGFILE\0" +/* 1235 */ "configfile\0" +/* 1246 */ "Increase output debug message level\0" +/* 1282 */ "DEBUG_LEVEL\0" +/* 1294 */ "debug-level\0" +/* 1306 */ "this package was built using 'configure --disable--debug'\0" +/* 1364 */ "Set the output debug message level\0" +/* 1399 */ "SET_DEBUG_LEVEL\0" +/* 1415 */ "set-debug-level\0" +/* 1431 */ "frequency drift file name\0" +/* 1457 */ "DRIFTFILE\0" +/* 1467 */ "driftfile\0" +/* 1477 */ "Allow the first adjustment to be Big\0" +/* 1514 */ "PANICGATE\0" +/* 1524 */ "panicgate\0" +/* 1534 */ "Jail directory\0" +/* 1549 */ "JAILDIR\0" +/* 1557 */ "jaildir\0" +/* 1565 */ "built without --enable-clockctl or --enable-linuxcaps\0" +/* 1619 */ "Listen on an interface name or address\0" +/* 1658 */ "INTERFACE\0" +/* 1668 */ "interface\0" +/* 1678 */ "path to symmetric keys\0" +/* 1701 */ "KEYFILE\0" +/* 1709 */ "keyfile\0" +/* 1717 */ "path to the log file\0" +/* 1738 */ "LOGFILE\0" +/* 1746 */ "logfile\0" +/* 1754 */ "Do not listen to virtual interfaces\0" +/* 1790 */ "NOVIRTUALIPS\0" +/* 1803 */ "novirtualips\0" +/* 1816 */ "Modify Multimedia Timer (Windows only)\0" +/* 1855 */ "MODIFYMMTIMER\0" +/* 1869 */ "modifymmtimer\0" +/* 1883 */ "Do not fork\0" +/* 1895 */ "NOFORK\0" +/* 1902 */ "nofork\0" +/* 1909 */ "Run at high priority\0" +/* 1930 */ "NICE\0" +/* 1935 */ "nice\0" +/* 1940 */ "path to the PID file\0" +/* 1961 */ "PIDFILE\0" +/* 1969 */ "pidfile\0" +/* 1977 */ "Process priority\0" +/* 1994 */ "PRIORITY\0" +/* 2003 */ "priority\0" +/* 2012 */ "Set the time and quit\0" +/* 2034 */ "QUIT\0" +/* 2039 */ "quit\0" +/* 2044 */ "Broadcast/propagation delay\0" +/* 2072 */ "PROPAGATIONDELAY\0" +/* 2089 */ "propagationdelay\0" +/* 2106 */ "Save parsed configuration and quit\0" +/* 2141 */ "SAVECONFIGQUIT\0" +/* 2156 */ "saveconfigquit\0" +/* 2171 */ "Statistics file location\0" +/* 2196 */ "STATSDIR\0" +/* 2205 */ "statsdir\0" +/* 2214 */ "Trusted key number\0" +/* 2233 */ "TRUSTEDKEY\0" +/* 2244 */ "trustedkey\0" +/* 2255 */ "Run as userid (or userid:groupid)\0" +/* 2289 */ "USER\0" +/* 2294 */ "user\0" +/* 2299 */ "interval in seconds between scans for new or dropped interfaces\0" +/* 2363 */ "UPDATEINTERVAL\0" +/* 2378 */ "updateinterval\0" +/* 2393 */ "make ARG an ntp variable (RW)\0" +/* 2423 */ "VAR\0" +/* 2427 */ "var\0" +/* 2431 */ "make ARG an ntp variable (RW|DEF)\0" +/* 2465 */ "DVAR\0" +/* 2470 */ "dvar\0" +/* 2475 */ "Seconds to wait for first clock sync\0" +/* 2512 */ "WAIT_SYNC\0" +/* 2522 */ "wait-sync\0" +/* 2532 */ "Slew up to 600 seconds\0" +/* 2555 */ "SLEW\0" +/* 2560 */ "slew\0" +/* 2565 */ "Use CPU cycle counter (Windows only)\0" +/* 2602 */ "USEPCC\0" +/* 2609 */ "usepcc\0" +/* 2616 */ "Force CPU cycle counter use (Windows only)\0" +/* 2659 */ "PCCFREQ\0" +/* 2667 */ "pccfreq\0" +/* 2675 */ "Display extended usage information and exit\0" +/* 2719 */ "help\0" +/* 2724 */ "Extended usage information passed thru pager\0" +/* 2769 */ "more-help\0" +/* 2779 */ "Output version information and exit\0" +/* 2815 */ "version\0" +/* 2823 */ "Save the option state to a config file\0" +/* 2862 */ "save-opts\0" +/* 2872 */ "Load options from a config file\0" +/* 2904 */ "LOAD_OPTS\0" +/* 2914 */ "no-load-opts\0" +/* 2927 */ "no\0" +/* 2930 */ "NTPDSIM\0" +/* 2938 */ "ntpdsim - NTP daemon simulation program - Ver. 4.2.7p272\n" + "USAGE: %s [ - [] | --[{=| }] ]...\n\0" +/* 3053 */ "$HOME\0" +/* 3059 */ ".\0" +/* 3061 */ ".ntprc\0" +/* 3068 */ "http://bugs.ntp.org, bugs@ntp.org\0" +/* 3102 */ "\n\n\0" +/* 3105 */ "ntpdsim 4.2.7p272"; + +/* + * ipv4 option description with * "Must also have options" and "Incompatible options": */ -static char const zIpv4Text[] = - "Force IPv4 DNS name resolution"; -static char const zIpv4_NAME[] = "IPV4"; -static char const zIpv4_Name[] = "ipv4"; -static const int - aIpv4CantList[] = { +#define IPV4_DESC (ntpdsim_opt_strs+957) +#define IPV4_NAME (ntpdsim_opt_strs+988) +#define IPV4_name (ntpdsim_opt_strs+993) +static int const aIpv4CantList[] = { INDEX_OPT_IPV6, NO_EQUIVALENT }; -#define IPV4_FLAGS (OPTST_DISABLED) +#define IPV4_FLAGS (OPTST_DISABLED) /* - * Ipv6 option description with + * ipv6 option description with * "Must also have options" and "Incompatible options": */ -static char const zIpv6Text[] = - "Force IPv6 DNS name resolution"; -static char const zIpv6_NAME[] = "IPV6"; -static char const zIpv6_Name[] = "ipv6"; -static const int - aIpv6CantList[] = { +#define IPV6_DESC (ntpdsim_opt_strs+998) +#define IPV6_NAME (ntpdsim_opt_strs+1029) +#define IPV6_name (ntpdsim_opt_strs+1034) +static int const aIpv6CantList[] = { INDEX_OPT_IPV4, NO_EQUIVALENT }; -#define IPV6_FLAGS (OPTST_DISABLED) +#define IPV6_FLAGS (OPTST_DISABLED) /* - * Authreq option description with + * authreq option description with * "Must also have options" and "Incompatible options": */ -static char const zAuthreqText[] = - "Require crypto authentication"; -static char const zAuthreq_NAME[] = "AUTHREQ"; -static char const zAuthreq_Name[] = "authreq"; -static const int - aAuthreqCantList[] = { +#define AUTHREQ_DESC (ntpdsim_opt_strs+1039) +#define AUTHREQ_NAME (ntpdsim_opt_strs+1069) +#define AUTHREQ_name (ntpdsim_opt_strs+1077) +static int const aAuthreqCantList[] = { INDEX_OPT_AUTHNOREQ, NO_EQUIVALENT }; -#define AUTHREQ_FLAGS (OPTST_DISABLED) +#define AUTHREQ_FLAGS (OPTST_DISABLED) /* - * Authnoreq option description with + * authnoreq option description with * "Must also have options" and "Incompatible options": */ -static char const zAuthnoreqText[] = - "Do not require crypto authentication"; -static char const zAuthnoreq_NAME[] = "AUTHNOREQ"; -static char const zAuthnoreq_Name[] = "authnoreq"; -static const int - aAuthnoreqCantList[] = { +#define AUTHNOREQ_DESC (ntpdsim_opt_strs+1085) +#define AUTHNOREQ_NAME (ntpdsim_opt_strs+1122) +#define AUTHNOREQ_name (ntpdsim_opt_strs+1132) +static int const aAuthnoreqCantList[] = { INDEX_OPT_AUTHREQ, NO_EQUIVALENT }; -#define AUTHNOREQ_FLAGS (OPTST_DISABLED) +#define AUTHNOREQ_FLAGS (OPTST_DISABLED) /* - * Bcastsync option description: + * bcastsync option description: */ -static char const zBcastsyncText[] = - "Allow us to sync to broadcast servers"; -static char const zBcastsync_NAME[] = "BCASTSYNC"; -static char const zBcastsync_Name[] = "bcastsync"; -#define BCASTSYNC_FLAGS (OPTST_DISABLED) +#define BCASTSYNC_DESC (ntpdsim_opt_strs+1142) +#define BCASTSYNC_NAME (ntpdsim_opt_strs+1180) +#define BCASTSYNC_name (ntpdsim_opt_strs+1190) +#define BCASTSYNC_FLAGS (OPTST_DISABLED) /* - * Configfile option description: + * configfile option description: */ -static char const zConfigfileText[] = - "configuration file name"; -static char const zConfigfile_NAME[] = "CONFIGFILE"; -static char const zConfigfile_Name[] = "configfile"; -#define CONFIGFILE_FLAGS (OPTST_DISABLED \ +#define CONFIGFILE_DESC (ntpdsim_opt_strs+1200) +#define CONFIGFILE_NAME (ntpdsim_opt_strs+1224) +#define CONFIGFILE_name (ntpdsim_opt_strs+1235) +#define CONFIGFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Debug_Level option description: + * debug-level option description: */ #ifdef DEBUG -static char const zDebug_LevelText[] = - "Increase output debug message level"; -static char const zDebug_Level_NAME[] = "DEBUG_LEVEL"; -static char const zDebug_Level_Name[] = "debug-level"; -#define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) - -#else /* disable Debug_Level */ -#define DEBUG_LEVEL_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zDebug_Level_NAME NULL -static char const zDebug_Level_Name[] = "debug-level"; -static char const zDebug_LevelText[] = "this package was built using 'configure --disable--debug'"; +#define DEBUG_LEVEL_DESC (ntpdsim_opt_strs+1246) +#define DEBUG_LEVEL_NAME (ntpdsim_opt_strs+1282) +#define DEBUG_LEVEL_name (ntpdsim_opt_strs+1294) +#define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) + +#else /* disable debug-level */ +#define DEBUG_LEVEL_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define DEBUG_LEVEL_NAME NULL +#define DEBUG_LEVEL_DESC (ntpdsim_opt_strs+1306) +#define DEBUG_LEVEL_name (ntpdsim_opt_strs+1294) #endif /* DEBUG */ /* - * Set_Debug_Level option description: + * set-debug-level option description: */ #ifdef DEBUG -static char const zSet_Debug_LevelText[] = - "Set the output debug message level"; -static char const zSet_Debug_Level_NAME[] = "SET_DEBUG_LEVEL"; -static char const zSet_Debug_Level_Name[] = "set-debug-level"; -#define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ +#define SET_DEBUG_LEVEL_DESC (ntpdsim_opt_strs+1364) +#define SET_DEBUG_LEVEL_NAME (ntpdsim_opt_strs+1399) +#define SET_DEBUG_LEVEL_name (ntpdsim_opt_strs+1415) +#define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -#else /* disable Set_Debug_Level */ -#define SET_DEBUG_LEVEL_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zSet_Debug_Level_NAME NULL -static char const zSet_Debug_Level_Name[] = "set-debug-level"; -static char const zSet_Debug_LevelText[] = "this package was built using 'configure --disable--debug'"; +#else /* disable set-debug-level */ +#define SET_DEBUG_LEVEL_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define SET_DEBUG_LEVEL_NAME NULL +#define SET_DEBUG_LEVEL_DESC (ntpdsim_opt_strs+1306) +#define SET_DEBUG_LEVEL_name (ntpdsim_opt_strs+1415) #endif /* DEBUG */ /* - * Driftfile option description: + * driftfile option description: */ -static char const zDriftfileText[] = - "frequency drift file name"; -static char const zDriftfile_NAME[] = "DRIFTFILE"; -static char const zDriftfile_Name[] = "driftfile"; -#define DRIFTFILE_FLAGS (OPTST_DISABLED \ +#define DRIFTFILE_DESC (ntpdsim_opt_strs+1431) +#define DRIFTFILE_NAME (ntpdsim_opt_strs+1457) +#define DRIFTFILE_name (ntpdsim_opt_strs+1467) +#define DRIFTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Panicgate option description: + * panicgate option description: */ -static char const zPanicgateText[] = - "Allow the first adjustment to be Big"; -static char const zPanicgate_NAME[] = "PANICGATE"; -static char const zPanicgate_Name[] = "panicgate"; -#define PANICGATE_FLAGS (OPTST_DISABLED) +#define PANICGATE_DESC (ntpdsim_opt_strs+1477) +#define PANICGATE_NAME (ntpdsim_opt_strs+1514) +#define PANICGATE_name (ntpdsim_opt_strs+1524) +#define PANICGATE_FLAGS (OPTST_DISABLED) /* - * Jaildir option description: + * jaildir option description: */ #ifdef HAVE_DROPROOT -static char const zJaildirText[] = - "Jail directory"; -static char const zJaildir_NAME[] = "JAILDIR"; -static char const zJaildir_Name[] = "jaildir"; -#define JAILDIR_FLAGS (OPTST_DISABLED \ +#define JAILDIR_DESC (ntpdsim_opt_strs+1534) +#define JAILDIR_NAME (ntpdsim_opt_strs+1549) +#define JAILDIR_name (ntpdsim_opt_strs+1557) +#define JAILDIR_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -#else /* disable Jaildir */ -#define JAILDIR_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zJaildir_NAME NULL -static char const zJaildir_Name[] = "jaildir"; -static char const zJaildirText[] = "built without --enable-clockctl or --enable-linuxcaps"; +#else /* disable jaildir */ +#define JAILDIR_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define JAILDIR_NAME NULL +#define JAILDIR_DESC (ntpdsim_opt_strs+1565) +#define JAILDIR_name (ntpdsim_opt_strs+1557) #endif /* HAVE_DROPROOT */ /* - * Interface option description: + * interface option description: */ -static char const zInterfaceText[] = - "Listen on an interface name or address"; -static char const zInterface_NAME[] = "INTERFACE"; -static char const zInterface_Name[] = "interface"; -#define INTERFACE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ +#define INTERFACE_DESC (ntpdsim_opt_strs+1619) +#define INTERFACE_NAME (ntpdsim_opt_strs+1658) +#define INTERFACE_name (ntpdsim_opt_strs+1668) +#define INTERFACE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Keyfile option description: + * keyfile option description: */ -static char const zKeyfileText[] = - "path to symmetric keys"; -static char const zKeyfile_NAME[] = "KEYFILE"; -static char const zKeyfile_Name[] = "keyfile"; -#define KEYFILE_FLAGS (OPTST_DISABLED \ +#define KEYFILE_DESC (ntpdsim_opt_strs+1678) +#define KEYFILE_NAME (ntpdsim_opt_strs+1701) +#define KEYFILE_name (ntpdsim_opt_strs+1709) +#define KEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Logfile option description: + * logfile option description: */ -static char const zLogfileText[] = - "path to the log file"; -static char const zLogfile_NAME[] = "LOGFILE"; -static char const zLogfile_Name[] = "logfile"; -#define LOGFILE_FLAGS (OPTST_DISABLED \ +#define LOGFILE_DESC (ntpdsim_opt_strs+1717) +#define LOGFILE_NAME (ntpdsim_opt_strs+1738) +#define LOGFILE_name (ntpdsim_opt_strs+1746) +#define LOGFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Novirtualips option description: + * novirtualips option description: */ -static char const zNovirtualipsText[] = - "Do not listen to virtual interfaces"; -static char const zNovirtualips_NAME[] = "NOVIRTUALIPS"; -static char const zNovirtualips_Name[] = "novirtualips"; -#define NOVIRTUALIPS_FLAGS (OPTST_DISABLED) +#define NOVIRTUALIPS_DESC (ntpdsim_opt_strs+1754) +#define NOVIRTUALIPS_NAME (ntpdsim_opt_strs+1790) +#define NOVIRTUALIPS_name (ntpdsim_opt_strs+1803) +#define NOVIRTUALIPS_FLAGS (OPTST_DISABLED) /* - * Modifymmtimer option description: + * modifymmtimer option description: */ #ifdef SYS_WINNT -static char const zModifymmtimerText[] = - "Modify Multimedia Timer (Windows only)"; -static char const zModifymmtimer_NAME[] = "MODIFYMMTIMER"; -static char const zModifymmtimer_Name[] = "modifymmtimer"; -#define MODIFYMMTIMER_FLAGS (OPTST_DISABLED) - -#else /* disable Modifymmtimer */ -#define MODIFYMMTIMER_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zModifymmtimer_NAME NULL -#define zModifymmtimerText NULL -#define zModifymmtimer_Name NULL +#define MODIFYMMTIMER_DESC (ntpdsim_opt_strs+1816) +#define MODIFYMMTIMER_NAME (ntpdsim_opt_strs+1855) +#define MODIFYMMTIMER_name (ntpdsim_opt_strs+1869) +#define MODIFYMMTIMER_FLAGS (OPTST_DISABLED) + +#else /* disable modifymmtimer */ +#define MODIFYMMTIMER_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define MODIFYMMTIMER_NAME NULL +#define MODIFYMMTIMER_DESC NULL +#define MODIFYMMTIMER_name NULL #endif /* SYS_WINNT */ /* - * Nofork option description: + * nofork option description with + * "Must also have options" and "Incompatible options": */ -static char const zNoforkText[] = - "Do not fork"; -static char const zNofork_NAME[] = "NOFORK"; -static char const zNofork_Name[] = "nofork"; -#define NOFORK_FLAGS (OPTST_DISABLED) +#define NOFORK_DESC (ntpdsim_opt_strs+1883) +#define NOFORK_NAME (ntpdsim_opt_strs+1895) +#define NOFORK_name (ntpdsim_opt_strs+1902) +static int const aNoforkCantList[] = { + INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; +#define NOFORK_FLAGS (OPTST_DISABLED) /* - * Nice option description: + * nice option description: */ -static char const zNiceText[] = - "Run at high priority"; -static char const zNice_NAME[] = "NICE"; -static char const zNice_Name[] = "nice"; -#define NICE_FLAGS (OPTST_DISABLED) +#define NICE_DESC (ntpdsim_opt_strs+1909) +#define NICE_NAME (ntpdsim_opt_strs+1930) +#define NICE_name (ntpdsim_opt_strs+1935) +#define NICE_FLAGS (OPTST_DISABLED) /* - * Pidfile option description: + * pidfile option description: */ -static char const zPidfileText[] = - "path to the PID file"; -static char const zPidfile_NAME[] = "PIDFILE"; -static char const zPidfile_Name[] = "pidfile"; -#define PIDFILE_FLAGS (OPTST_DISABLED \ +#define PIDFILE_DESC (ntpdsim_opt_strs+1940) +#define PIDFILE_NAME (ntpdsim_opt_strs+1961) +#define PIDFILE_name (ntpdsim_opt_strs+1969) +#define PIDFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Priority option description: + * priority option description: */ -static char const zPriorityText[] = - "Process priority"; -static char const zPriority_NAME[] = "PRIORITY"; -static char const zPriority_Name[] = "priority"; -#define PRIORITY_FLAGS (OPTST_DISABLED \ +#define PRIORITY_DESC (ntpdsim_opt_strs+1977) +#define PRIORITY_NAME (ntpdsim_opt_strs+1994) +#define PRIORITY_name (ntpdsim_opt_strs+2003) +#define PRIORITY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* - * Quit option description: + * quit option description with + * "Must also have options" and "Incompatible options": */ -static char const zQuitText[] = - "Set the time and quit"; -static char const zQuit_NAME[] = "QUIT"; -static char const zQuit_Name[] = "quit"; -#define QUIT_FLAGS (OPTST_DISABLED) +#define QUIT_DESC (ntpdsim_opt_strs+2012) +#define QUIT_NAME (ntpdsim_opt_strs+2034) +#define QUIT_name (ntpdsim_opt_strs+2039) +static int const aQuitCantList[] = { + INDEX_OPT_SAVECONFIGQUIT, + INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; +#define QUIT_FLAGS (OPTST_DISABLED) /* - * Propagationdelay option description: + * propagationdelay option description: */ -static char const zPropagationdelayText[] = - "Broadcast/propagation delay"; -static char const zPropagationdelay_NAME[] = "PROPAGATIONDELAY"; -static char const zPropagationdelay_Name[] = "propagationdelay"; -#define PROPAGATIONDELAY_FLAGS (OPTST_DISABLED \ +#define PROPAGATIONDELAY_DESC (ntpdsim_opt_strs+2044) +#define PROPAGATIONDELAY_NAME (ntpdsim_opt_strs+2072) +#define PROPAGATIONDELAY_name (ntpdsim_opt_strs+2089) +#define PROPAGATIONDELAY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Saveconfigquit option description: + * saveconfigquit option description with + * "Must also have options" and "Incompatible options": */ #ifdef SAVECONFIG -static char const zSaveconfigquitText[] = - "Save parsed configuration and quit"; -static char const zSaveconfigquit_NAME[] = "SAVECONFIGQUIT"; -static char const zSaveconfigquit_Name[] = "saveconfigquit"; -#define SAVECONFIGQUIT_FLAGS (OPTST_DISABLED \ +#define SAVECONFIGQUIT_DESC (ntpdsim_opt_strs+2106) +#define SAVECONFIGQUIT_NAME (ntpdsim_opt_strs+2141) +#define SAVECONFIGQUIT_name (ntpdsim_opt_strs+2156) +static int const aSaveconfigquitCantList[] = { + INDEX_OPT_QUIT, + INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; +#define SAVECONFIGQUIT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -#else /* disable Saveconfigquit */ -#define SAVECONFIGQUIT_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zSaveconfigquit_NAME NULL -#define zSaveconfigquitText NULL -#define zSaveconfigquit_Name NULL +#else /* disable saveconfigquit */ +#define SAVECONFIGQUIT_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define aSaveconfigquitCantList NULL +#define SAVECONFIGQUIT_NAME NULL +#define SAVECONFIGQUIT_DESC NULL +#define SAVECONFIGQUIT_name NULL #endif /* SAVECONFIG */ /* - * Statsdir option description: + * statsdir option description: */ -static char const zStatsdirText[] = - "Statistics file location"; -static char const zStatsdir_NAME[] = "STATSDIR"; -static char const zStatsdir_Name[] = "statsdir"; -#define STATSDIR_FLAGS (OPTST_DISABLED \ +#define STATSDIR_DESC (ntpdsim_opt_strs+2171) +#define STATSDIR_NAME (ntpdsim_opt_strs+2196) +#define STATSDIR_name (ntpdsim_opt_strs+2205) +#define STATSDIR_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Trustedkey option description: + * trustedkey option description: */ -static char const zTrustedkeyText[] = - "Trusted key number"; -static char const zTrustedkey_NAME[] = "TRUSTEDKEY"; -static char const zTrustedkey_Name[] = "trustedkey"; -#define TRUSTEDKEY_FLAGS (OPTST_DISABLED | OPTST_STACKED \ +#define TRUSTEDKEY_DESC (ntpdsim_opt_strs+2214) +#define TRUSTEDKEY_NAME (ntpdsim_opt_strs+2233) +#define TRUSTEDKEY_name (ntpdsim_opt_strs+2244) +#define TRUSTEDKEY_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * User option description: + * user option description: */ #ifdef HAVE_DROPROOT -static char const zUserText[] = - "Run as userid (or userid:groupid)"; -static char const zUser_NAME[] = "USER"; -static char const zUser_Name[] = "user"; -#define USER_FLAGS (OPTST_DISABLED \ +#define USER_DESC (ntpdsim_opt_strs+2255) +#define USER_NAME (ntpdsim_opt_strs+2289) +#define USER_name (ntpdsim_opt_strs+2294) +#define USER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -#else /* disable User */ -#define USER_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zUser_NAME NULL -static char const zUser_Name[] = "user"; -static char const zUserText[] = "built without --enable-clockctl or --enable-linuxcaps"; +#else /* disable user */ +#define USER_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define USER_NAME NULL +#define USER_DESC (ntpdsim_opt_strs+1565) +#define USER_name (ntpdsim_opt_strs+2294) #endif /* HAVE_DROPROOT */ /* - * Updateinterval option description: + * updateinterval option description: */ -static char const zUpdateintervalText[] = - "interval in seconds between scans for new or dropped interfaces"; -static char const zUpdateinterval_NAME[] = "UPDATEINTERVAL"; -static char const zUpdateinterval_Name[] = "updateinterval"; -#define UPDATEINTERVAL_FLAGS (OPTST_DISABLED \ +#define UPDATEINTERVAL_DESC (ntpdsim_opt_strs+2299) +#define UPDATEINTERVAL_NAME (ntpdsim_opt_strs+2363) +#define UPDATEINTERVAL_name (ntpdsim_opt_strs+2378) +#define UPDATEINTERVAL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* - * Var option description: + * var option description: */ -static char const zVarText[] = - "make ARG an ntp variable (RW)"; -static char const zVar_NAME[] = "VAR"; -static char const zVar_Name[] = "var"; -#define VAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ +#define VAR_DESC (ntpdsim_opt_strs+2393) +#define VAR_NAME (ntpdsim_opt_strs+2423) +#define VAR_name (ntpdsim_opt_strs+2427) +#define VAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Dvar option description: + * dvar option description: */ -static char const zDvarText[] = - "make ARG an ntp variable (RW|DEF)"; -static char const zDvar_NAME[] = "DVAR"; -static char const zDvar_Name[] = "dvar"; -#define DVAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ +#define DVAR_DESC (ntpdsim_opt_strs+2431) +#define DVAR_NAME (ntpdsim_opt_strs+2465) +#define DVAR_name (ntpdsim_opt_strs+2470) +#define DVAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Slew option description: + * wait-sync option description with + * "Must also have options" and "Incompatible options": + */ +#ifdef HAVE_WORKING_FORK +#define WAIT_SYNC_DESC (ntpdsim_opt_strs+2475) +#define WAIT_SYNC_NAME (ntpdsim_opt_strs+2512) +#define WAIT_SYNC_name (ntpdsim_opt_strs+2522) +static int const aWait_SyncCantList[] = { + INDEX_OPT_NOFORK, + INDEX_OPT_QUIT, + INDEX_OPT_SAVECONFIGQUIT, NO_EQUIVALENT }; +#define WAIT_SYNC_FLAGS (OPTST_DISABLED \ + | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) + +#else /* disable wait-sync */ +#define WAIT_SYNC_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define aWait_SyncCantList NULL +#define WAIT_SYNC_NAME NULL +#define WAIT_SYNC_DESC NULL +#define WAIT_SYNC_name NULL +#endif /* HAVE_WORKING_FORK */ + +/* + * slew option description: */ -static char const zSlewText[] = - "Slew up to 600 seconds"; -static char const zSlew_NAME[] = "SLEW"; -static char const zSlew_Name[] = "slew"; -#define SLEW_FLAGS (OPTST_DISABLED) +#define SLEW_DESC (ntpdsim_opt_strs+2532) +#define SLEW_NAME (ntpdsim_opt_strs+2555) +#define SLEW_name (ntpdsim_opt_strs+2560) +#define SLEW_FLAGS (OPTST_DISABLED) /* - * Usepcc option description: + * usepcc option description: */ #ifdef SYS_WINNT -static char const zUsepccText[] = - "Use CPU cycle counter (Windows only)"; -static char const zUsepcc_NAME[] = "USEPCC"; -static char const zUsepcc_Name[] = "usepcc"; -#define USEPCC_FLAGS (OPTST_DISABLED) - -#else /* disable Usepcc */ -#define USEPCC_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zUsepcc_NAME NULL -#define zUsepccText NULL -#define zUsepcc_Name NULL +#define USEPCC_DESC (ntpdsim_opt_strs+2565) +#define USEPCC_NAME (ntpdsim_opt_strs+2602) +#define USEPCC_name (ntpdsim_opt_strs+2609) +#define USEPCC_FLAGS (OPTST_DISABLED) + +#else /* disable usepcc */ +#define USEPCC_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define USEPCC_NAME NULL +#define USEPCC_DESC NULL +#define USEPCC_name NULL #endif /* SYS_WINNT */ /* - * Pccfreq option description: + * pccfreq option description: */ #ifdef SYS_WINNT -static char const zPccfreqText[] = - "Force CPU cycle counter use (Windows only)"; -static char const zPccfreq_NAME[] = "PCCFREQ"; -static char const zPccfreq_Name[] = "pccfreq"; -#define PCCFREQ_FLAGS (OPTST_DISABLED \ +#define PCCFREQ_DESC (ntpdsim_opt_strs+2616) +#define PCCFREQ_NAME (ntpdsim_opt_strs+2659) +#define PCCFREQ_name (ntpdsim_opt_strs+2667) +#define PCCFREQ_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -#else /* disable Pccfreq */ -#define PCCFREQ_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zPccfreq_NAME NULL -#define zPccfreqText NULL -#define zPccfreq_Name NULL +#else /* disable pccfreq */ +#define PCCFREQ_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#define PCCFREQ_NAME NULL +#define PCCFREQ_DESC NULL +#define PCCFREQ_name NULL #endif /* SYS_WINNT */ /* * Help/More_Help/Version option descriptions: */ -static char const zHelpText[] = "Display extended usage information and exit"; -static char const zHelp_Name[] = "help"; +#define HELP_DESC (ntpdsim_opt_strs+2675) +#define HELP_name (ntpdsim_opt_strs+2719) #ifdef HAVE_WORKING_FORK -#define OPTST_MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) -static char const zMore_Help_Name[] = "more-help"; -static char const zMore_HelpText[] = "Extended usage information passed thru pager"; +#define MORE_HELP_DESC (ntpdsim_opt_strs+2724) +#define MORE_HELP_name (ntpdsim_opt_strs+2769) +#define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else -#define OPTST_MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) -#define zMore_Help_Name NULL -#define zMore_HelpText NULL +#define MORE_HELP_DESC NULL +#define MORE_HELP_name NULL +#define MORE_HELP_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) #endif #ifdef NO_OPTIONAL_OPT_ARGS -# define OPTST_VERSION_FLAGS OPTST_IMM | OPTST_NO_INIT +# define VER_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else -# define OPTST_VERSION_FLAGS OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ - OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT +# define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ + OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif - -static char const zVersionText[] = "Output version information and exit"; -static char const zVersion_Name[] = "version"; -static char const zSave_OptsText[] = "Save the option state to a config file"; -static char const zSave_Opts_Name[] = "save-opts"; -static char const zLoad_OptsText[] = "Load options from a config file"; -static char const zLoad_Opts_NAME[] = "LOAD_OPTS"; -static char const zNotLoad_Opts_Name[] = "no-load-opts"; -static char const zNotLoad_Opts_Pfx[] = "no"; -#define zLoad_Opts_Name (zNotLoad_Opts_Name + 3) +#define VER_DESC (ntpdsim_opt_strs+2779) +#define VER_name (ntpdsim_opt_strs+2815) +#define SAVE_OPTS_DESC (ntpdsim_opt_strs+2823) +#define SAVE_OPTS_name (ntpdsim_opt_strs+2862) +#define LOAD_OPTS_DESC (ntpdsim_opt_strs+2872) +#define LOAD_OPTS_NAME (ntpdsim_opt_strs+2904) +#define NO_LOAD_OPTS_name (ntpdsim_opt_strs+2914) +#define LOAD_OPTS_pfx (ntpdsim_opt_strs+2927) +#define LOAD_OPTS_name (NO_LOAD_OPTS_name + 3) /* * Declare option callback procedures */ @@ -507,10 +651,10 @@ static tOptProc * When not under test, there are different procs to use */ extern tOptProc - optionBooleanVal, optionNestedVal, optionNumericVal, - optionPagedUsage, optionPrintVersion, optionResetOpt, - optionStackArg, optionTimeVal, optionUnstackArg, - optionVersionStderr; + ntpOptionPrintVersion, optionBooleanVal, optionNestedVal, + optionNumericVal, optionPagedUsage, optionResetOpt, + optionStackArg, optionTimeDate, optionTimeVal, + optionUnstackArg, optionVendorOption, optionVersionStderr; static tOptProc doUsageOpt; @@ -519,29 +663,24 @@ static tOptProc */ #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level -#define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level #endif /* defined(TEST_NTPDSIM_OPTS) */ -#ifdef TEST_NTPDSIM_OPTS -# define DOVERPROC optionVersionStderr -#else -# define DOVERPROC optionPrintVersion -#endif /* TEST_NTPDSIM_OPTS */ +#define VER_PROC ntpOptionPrintVersion /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Define the Ntpdsim Option Descriptions. + * Define the ntpdsim Option Descriptions. */ -static tOptDesc optDesc[ OPTION_CT ] = { +static tOptDesc optDesc[OPTION_CT] = { { /* entry idx, value */ 0, VALUE_OPT_IPV4, /* equiv idx, value */ 0, VALUE_OPT_IPV4, /* 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 }, /* --ipv4 */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aIpv4CantList, /* option proc */ NULL, - /* desc, NAME, name */ zIpv4Text, zIpv4_NAME, zIpv4_Name, + /* desc, NAME, name */ IPV4_DESC, IPV4_NAME, IPV4_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 1, VALUE_OPT_IPV6, @@ -549,11 +688,11 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ IPV6_FLAGS, 0, - /* last opt argumnt */ { NULL }, + /* last opt argumnt */ { NULL }, /* --ipv6 */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aIpv6CantList, /* option proc */ NULL, - /* desc, NAME, name */ zIpv6Text, zIpv6_NAME, zIpv6_Name, + /* desc, NAME, name */ IPV6_DESC, IPV6_NAME, IPV6_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 2, VALUE_OPT_AUTHREQ, @@ -561,11 +700,11 @@ 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 }, /* --authreq */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aAuthreqCantList, /* option proc */ NULL, - /* desc, NAME, name */ zAuthreqText, zAuthreq_NAME, zAuthreq_Name, + /* desc, NAME, name */ AUTHREQ_DESC, AUTHREQ_NAME, AUTHREQ_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 3, VALUE_OPT_AUTHNOREQ, @@ -573,11 +712,11 @@ 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 }, /* --authnoreq */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aAuthnoreqCantList, /* option proc */ NULL, - /* desc, NAME, name */ zAuthnoreqText, zAuthnoreq_NAME, zAuthnoreq_Name, + /* desc, NAME, name */ AUTHNOREQ_DESC, AUTHNOREQ_NAME, AUTHNOREQ_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 4, VALUE_OPT_BCASTSYNC, @@ -585,11 +724,11 @@ 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 }, /* --bcastsync */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zBcastsyncText, zBcastsync_NAME, zBcastsync_Name, + /* desc, NAME, name */ BCASTSYNC_DESC, BCASTSYNC_NAME, BCASTSYNC_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 5, VALUE_OPT_CONFIGFILE, @@ -597,11 +736,11 @@ 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 }, /* --configfile */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zConfigfileText, zConfigfile_NAME, zConfigfile_Name, + /* desc, NAME, name */ CONFIGFILE_DESC, CONFIGFILE_NAME, CONFIGFILE_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 6, VALUE_OPT_DEBUG_LEVEL, @@ -609,11 +748,11 @@ 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 }, /* --debug-level */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zDebug_LevelText, zDebug_Level_NAME, zDebug_Level_Name, + /* desc, NAME, name */ DEBUG_LEVEL_DESC, DEBUG_LEVEL_NAME, DEBUG_LEVEL_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 7, VALUE_OPT_SET_DEBUG_LEVEL, @@ -621,11 +760,11 @@ 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 }, /* --set-debug-level */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ SET_DEBUG_LEVEL_OPT_PROC, - /* desc, NAME, name */ zSet_Debug_LevelText, zSet_Debug_Level_NAME, zSet_Debug_Level_Name, + /* desc, NAME, name */ SET_DEBUG_LEVEL_DESC, SET_DEBUG_LEVEL_NAME, SET_DEBUG_LEVEL_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 8, VALUE_OPT_DRIFTFILE, @@ -633,11 +772,11 @@ 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 }, /* --driftfile */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zDriftfileText, zDriftfile_NAME, zDriftfile_Name, + /* desc, NAME, name */ DRIFTFILE_DESC, DRIFTFILE_NAME, DRIFTFILE_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 9, VALUE_OPT_PANICGATE, @@ -645,11 +784,11 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ PANICGATE_FLAGS, 0, - /* last opt argumnt */ { NULL }, + /* last opt argumnt */ { NULL }, /* --panicgate */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zPanicgateText, zPanicgate_NAME, zPanicgate_Name, + /* desc, NAME, name */ PANICGATE_DESC, PANICGATE_NAME, PANICGATE_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 10, VALUE_OPT_JAILDIR, @@ -657,11 +796,11 @@ 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 }, /* --jaildir */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zJaildirText, zJaildir_NAME, zJaildir_Name, + /* desc, NAME, name */ JAILDIR_DESC, JAILDIR_NAME, JAILDIR_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 11, VALUE_OPT_INTERFACE, @@ -669,11 +808,11 @@ 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 }, /* --interface */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, - /* desc, NAME, name */ zInterfaceText, zInterface_NAME, zInterface_Name, + /* desc, NAME, name */ INTERFACE_DESC, INTERFACE_NAME, INTERFACE_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 12, VALUE_OPT_KEYFILE, @@ -681,11 +820,11 @@ 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 }, /* --keyfile */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zKeyfileText, zKeyfile_NAME, zKeyfile_Name, + /* desc, NAME, name */ KEYFILE_DESC, KEYFILE_NAME, KEYFILE_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 13, VALUE_OPT_LOGFILE, @@ -693,11 +832,11 @@ 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 }, /* --logfile */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zLogfileText, zLogfile_NAME, zLogfile_Name, + /* desc, NAME, name */ LOGFILE_DESC, LOGFILE_NAME, LOGFILE_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 14, VALUE_OPT_NOVIRTUALIPS, @@ -705,11 +844,11 @@ 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 }, /* --novirtualips */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zNovirtualipsText, zNovirtualips_NAME, zNovirtualips_Name, + /* desc, NAME, name */ NOVIRTUALIPS_DESC, NOVIRTUALIPS_NAME, NOVIRTUALIPS_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 15, VALUE_OPT_MODIFYMMTIMER, @@ -717,11 +856,11 @@ 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 }, /* --modifymmtimer */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zModifymmtimerText, zModifymmtimer_NAME, zModifymmtimer_Name, + /* desc, NAME, name */ MODIFYMMTIMER_DESC, MODIFYMMTIMER_NAME, MODIFYMMTIMER_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 16, VALUE_OPT_NOFORK, @@ -729,11 +868,11 @@ 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 }, /* --nofork */ /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, + /* must/cannot opts */ NULL, aNoforkCantList, /* option proc */ NULL, - /* desc, NAME, name */ zNoforkText, zNofork_NAME, zNofork_Name, + /* desc, NAME, name */ NOFORK_DESC, NOFORK_NAME, NOFORK_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 17, VALUE_OPT_NICE, @@ -741,11 +880,11 @@ 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 }, /* --nice */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zNiceText, zNice_NAME, zNice_Name, + /* desc, NAME, name */ NICE_DESC, NICE_NAME, NICE_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 18, VALUE_OPT_PIDFILE, @@ -753,11 +892,11 @@ 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 }, /* --pidfile */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zPidfileText, zPidfile_NAME, zPidfile_Name, + /* desc, NAME, name */ PIDFILE_DESC, PIDFILE_NAME, PIDFILE_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 19, VALUE_OPT_PRIORITY, @@ -765,11 +904,11 @@ 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 }, /* --priority */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionNumericVal, - /* desc, NAME, name */ zPriorityText, zPriority_NAME, zPriority_Name, + /* desc, NAME, name */ PRIORITY_DESC, PRIORITY_NAME, PRIORITY_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 20, VALUE_OPT_QUIT, @@ -777,11 +916,11 @@ 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 }, /* --quit */ /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, + /* must/cannot opts */ NULL, aQuitCantList, /* option proc */ NULL, - /* desc, NAME, name */ zQuitText, zQuit_NAME, zQuit_Name, + /* desc, NAME, name */ QUIT_DESC, QUIT_NAME, QUIT_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 21, VALUE_OPT_PROPAGATIONDELAY, @@ -789,11 +928,11 @@ 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 }, /* --propagationdelay */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zPropagationdelayText, zPropagationdelay_NAME, zPropagationdelay_Name, + /* desc, NAME, name */ PROPAGATIONDELAY_DESC, PROPAGATIONDELAY_NAME, PROPAGATIONDELAY_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 22, VALUE_OPT_SAVECONFIGQUIT, @@ -801,11 +940,11 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ SAVECONFIGQUIT_FLAGS, 0, - /* last opt argumnt */ { NULL }, + /* last opt argumnt */ { NULL }, /* --saveconfigquit */ /* arg list/cookie */ NULL, - /* must/cannot opts */ NULL, NULL, + /* must/cannot opts */ NULL, aSaveconfigquitCantList, /* option proc */ NULL, - /* desc, NAME, name */ zSaveconfigquitText, zSaveconfigquit_NAME, zSaveconfigquit_Name, + /* desc, NAME, name */ SAVECONFIGQUIT_DESC, SAVECONFIGQUIT_NAME, SAVECONFIGQUIT_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 23, VALUE_OPT_STATSDIR, @@ -813,11 +952,11 @@ 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 }, /* --statsdir */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zStatsdirText, zStatsdir_NAME, zStatsdir_Name, + /* desc, NAME, name */ STATSDIR_DESC, STATSDIR_NAME, STATSDIR_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 24, VALUE_OPT_TRUSTEDKEY, @@ -825,11 +964,11 @@ 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 }, /* --trustedkey */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, - /* desc, NAME, name */ zTrustedkeyText, zTrustedkey_NAME, zTrustedkey_Name, + /* desc, NAME, name */ TRUSTEDKEY_DESC, TRUSTEDKEY_NAME, TRUSTEDKEY_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 25, VALUE_OPT_USER, @@ -837,11 +976,11 @@ 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 }, /* --user */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zUserText, zUser_NAME, zUser_Name, + /* desc, NAME, name */ USER_DESC, USER_NAME, USER_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 26, VALUE_OPT_UPDATEINTERVAL, @@ -849,11 +988,11 @@ 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 }, /* --updateinterval */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionNumericVal, - /* desc, NAME, name */ zUpdateintervalText, zUpdateinterval_NAME, zUpdateinterval_Name, + /* desc, NAME, name */ UPDATEINTERVAL_DESC, UPDATEINTERVAL_NAME, UPDATEINTERVAL_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 27, VALUE_OPT_VAR, @@ -861,11 +1000,11 @@ 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 }, /* --var */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, - /* desc, NAME, name */ zVarText, zVar_NAME, zVar_Name, + /* desc, NAME, name */ VAR_DESC, VAR_NAME, VAR_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 28, VALUE_OPT_DVAR, @@ -873,65 +1012,77 @@ 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 }, /* --dvar */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, - /* desc, NAME, name */ zDvarText, zDvar_NAME, zDvar_Name, + /* desc, NAME, name */ DVAR_DESC, DVAR_NAME, DVAR_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 29, VALUE_OPT_SLEW, - /* equiv idx, value */ 29, VALUE_OPT_SLEW, + { /* entry idx, value */ 29, VALUE_OPT_WAIT_SYNC, + /* equiv idx, value */ 29, VALUE_OPT_WAIT_SYNC, + /* equivalenced to */ NO_EQUIVALENT, + /* min, max, act ct */ 0, 1, 0, + /* opt state flags */ WAIT_SYNC_FLAGS, 0, + /* last opt argumnt */ { NULL }, /* --wait-sync */ + /* arg list/cookie */ NULL, + /* must/cannot opts */ NULL, aWait_SyncCantList, + /* option proc */ optionNumericVal, + /* desc, NAME, name */ WAIT_SYNC_DESC, WAIT_SYNC_NAME, WAIT_SYNC_name, + /* disablement strs */ NULL, NULL }, + + { /* entry idx, value */ 30, VALUE_OPT_SLEW, + /* equiv idx, value */ 30, VALUE_OPT_SLEW, /* 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 }, /* --slew */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zSlewText, zSlew_NAME, zSlew_Name, + /* desc, NAME, name */ SLEW_DESC, SLEW_NAME, SLEW_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 30, VALUE_OPT_USEPCC, - /* equiv idx, value */ 30, VALUE_OPT_USEPCC, + { /* entry idx, value */ 31, VALUE_OPT_USEPCC, + /* equiv idx, value */ 31, VALUE_OPT_USEPCC, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ USEPCC_FLAGS, 0, - /* last opt argumnt */ { NULL }, + /* last opt argumnt */ { NULL }, /* --usepcc */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zUsepccText, zUsepcc_NAME, zUsepcc_Name, + /* desc, NAME, name */ USEPCC_DESC, USEPCC_NAME, USEPCC_name, /* disablement strs */ NULL, NULL }, - { /* entry idx, value */ 31, VALUE_OPT_PCCFREQ, - /* equiv idx, value */ 31, VALUE_OPT_PCCFREQ, + { /* entry idx, value */ 32, VALUE_OPT_PCCFREQ, + /* equiv idx, value */ 32, VALUE_OPT_PCCFREQ, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ PCCFREQ_FLAGS, 0, - /* last opt argumnt */ { NULL }, + /* last opt argumnt */ { NULL }, /* --pccfreq */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zPccfreqText, zPccfreq_NAME, zPccfreq_Name, + /* desc, NAME, name */ PCCFREQ_DESC, PCCFREQ_NAME, PCCFREQ_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ INDEX_OPT_VERSION, VALUE_OPT_VERSION, - /* equiv idx value */ NO_EQUIVALENT, 0, + /* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_VERSION, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_VERSION_FLAGS, 0, + /* opt state flags */ VER_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, - /* option proc */ DOVERPROC, - /* desc, NAME, name */ zVersionText, NULL, zVersion_Name, + /* option proc */ VER_PROC, + /* desc, NAME, name */ VER_DESC, NULL, VER_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ INDEX_OPT_HELP, VALUE_OPT_HELP, - /* equiv idx value */ NO_EQUIVALENT, 0, + /* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_HELP, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_IMM | OPTST_NO_INIT, 0, @@ -939,23 +1090,23 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ doUsageOpt, - /* desc, NAME, name */ zHelpText, NULL, zHelp_Name, + /* desc, NAME, name */ HELP_DESC, NULL, HELP_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ INDEX_OPT_MORE_HELP, VALUE_OPT_MORE_HELP, - /* equiv idx value */ NO_EQUIVALENT, 0, + /* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_MORE_HELP, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, - /* opt state flags */ OPTST_MORE_HELP_FLAGS, 0, + /* opt state flags */ MORE_HELP_FLAGS, 0, /* last opt argumnt */ { NULL }, /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionPagedUsage, - /* desc, NAME, name */ zMore_HelpText, NULL, zMore_Help_Name, + /* desc, NAME, name */ MORE_HELP_DESC, NULL, MORE_HELP_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ INDEX_OPT_SAVE_OPTS, VALUE_OPT_SAVE_OPTS, - /* equiv idx value */ NO_EQUIVALENT, 0, + /* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_SAVE_OPTS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) @@ -964,11 +1115,11 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zSave_OptsText, NULL, zSave_Opts_Name, + /* desc, NAME, name */ SAVE_OPTS_DESC, NULL, SAVE_OPTS_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ INDEX_OPT_LOAD_OPTS, VALUE_OPT_LOAD_OPTS, - /* equiv idx value */ NO_EQUIVALENT, 0, + /* equiv idx value */ NO_EQUIVALENT, VALUE_OPT_LOAD_OPTS, /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, NOLIMIT, 0, /* opt state flags */ OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) @@ -977,29 +1128,27 @@ static tOptDesc optDesc[ OPTION_CT ] = { /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionLoadOpt, - /* desc, NAME, name */ zLoad_OptsText, zLoad_Opts_NAME, zLoad_Opts_Name, - /* disablement strs */ zNotLoad_Opts_Name, zNotLoad_Opts_Pfx } + /* desc, NAME, name */ LOAD_OPTS_DESC, LOAD_OPTS_NAME, LOAD_OPTS_name, + /* disablement strs */ NO_LOAD_OPTS_name, LOAD_OPTS_pfx } }; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * Define the Ntpdsim Option Environment + * Define the ntpdsim Option Environment */ -static char const zPROGNAME[8] = "NTPDSIM"; -static char const zUsageTitle[113] = -"ntpdsim - NTP daemon simulation program - Ver. 4.2.6p3\n\ -USAGE: %s [ - [] | --[{=| }] ]...\n"; -static char const zRcName[7] = ".ntprc"; +#define zPROGNAME (ntpdsim_opt_strs+2930) +#define zUsageTitle (ntpdsim_opt_strs+2938) +#define zRcName (ntpdsim_opt_strs+3061) static char const * const apzHomeList[3] = { - "$HOME", - ".", + ntpdsim_opt_strs+3053, + ntpdsim_opt_strs+3059, NULL }; - -static char const zBugsAddr[34] = "http://bugs.ntp.org, bugs@ntp.org"; -#define zExplain NULL -static char const zDetail[7] = "\n\n"; -static char const zFullVersion[] = NTPDSIM_FULL_VERSION; -/* extracted from optcode.tlib near line 504 */ +#define zBugsAddr (ntpdsim_opt_strs+3068) +#define zExplain (NULL) +#define zDetail (ntpdsim_opt_strs+3102) +#define zFullVersion (ntpdsim_opt_strs+3105) +/* extracted from optcode.tlib near line 349 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -1010,8 +1159,76 @@ static char const zFullVersion[] = NTPDSIM_FULL_VERSION; #endif /* ENABLE_NLS */ -#define ntpdsim_full_usage NULL -#define ntpdsim_short_usage NULL +#define ntpdsim_full_usage (NULL) + +#define ntpdsim_short_usage (NULL) + +/* + * Create the static procedure(s) declared above. + */ +/** + * The callout function that invokes the optionUsage function. + * + * @param pOptions the AutoOpts option description structure + * @param pOptDesc the descriptor for the "help" (usage) option. + * @noreturn + */ +static void +doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc) +{ + optionUsage(&ntpdsimOptions, NTPDSIM_EXIT_SUCCESS); + /* NOTREACHED */ + (void)pOptDesc; + (void)pOptions; +} + +#if ! defined(TEST_NTPDSIM_OPTS) + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ +/** + * Code to handle the set-debug-level option, when DEBUG is #define-d. + * + * @param pOptions the ntpdsim options data structure + * @param pOptDesc the option descriptor for this option. + */ +#ifdef DEBUG +static void +doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc) +{ + /* extracted from ntpdbase-opts.def, line 100 */ +DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); + (void)pOptions; +} +#endif /* defined DEBUG */ +#endif /* defined(TEST_NTPDSIM_OPTS) */ +/* extracted from optmain.tlib near line 35 */ + +#if defined(TEST_NTPDSIM_OPTS) /* TEST MAIN PROCEDURE: */ + +extern void optionPutShell(tOptions*); + +/** + * Generated main procedure. This will emit text that a Bourne shell can + * process to handle its command line arguments. + * + * @param argc argument count + * @param argv argument vector + * @returns program exit code + */ +int +main(int argc, char ** argv) +{ + int res = NTPDSIM_EXIT_SUCCESS; + (void)optionProcess(&ntpdsimOptions, argc, argv); + optionPutShell(&ntpdsimOptions); + res = ferror(stdout); + if (res != 0) + fputs("output error writing to stdout\n", stderr); + return res; +} +#endif /* defined TEST_NTPDSIM_OPTS */ +/* extracted from optmain.tlib near line 1113 */ + #ifndef PKGDATADIR # define PKGDATADIR "" #endif @@ -1045,7 +1262,7 @@ tOptions ntpdsimOptions = { + OPTPROC_MISUSE ), 0, NULL, /* current option index, current option */ NULL, NULL, zPROGNAME, - zRcName, zCopyright, zCopyrightNotice, + zRcName, zCopyright, zLicenseDescrip, zFullVersion, apzHomeList, zUsageTitle, zExplain, zDetail, optDesc, zBugsAddr, /* address to send bugs to */ @@ -1060,59 +1277,12 @@ tOptions ntpdsimOptions = { NO_EQUIVALENT, /* '-#' option index */ NO_EQUIVALENT /* index of default opt */ }, - 37 /* full option count */, 32 /* user option count */, + 38 /* full option count */, 33 /* user option count */, ntpdsim_full_usage, ntpdsim_short_usage, NULL, NULL, PKGDATADIR, ntpdsim_packager_info }; -/* - * Create the static procedure(s) declared above. - */ -static void -doUsageOpt( - tOptions* pOptions, - tOptDesc* pOptDesc ) -{ - (void)pOptions; - USAGE(EXIT_SUCCESS); -} - -#if ! defined(TEST_NTPDSIM_OPTS) - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * - * For the set-debug-level option, when DEBUG is #define-d. - */ -#ifdef DEBUG -static void -doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc) -{ - /* extracted from ntpdbase-opts.def, line 100 */ -DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); -} -#endif /* defined DEBUG */ -#endif /* defined(TEST_NTPDSIM_OPTS) */ -/* extracted from optmain.tlib near line 107 */ - -#if defined(TEST_NTPDSIM_OPTS) /* TEST MAIN PROCEDURE: */ - -extern void optionPutShell(tOptions*); - -int -main(int argc, char** argv) -{ - int res = EXIT_SUCCESS; - (void)optionProcess(&ntpdsimOptions, argc, argv); - optionPutShell(&ntpdsimOptions); - res = ferror(stdout); - if (res != 0) - fputs("output error writing to stdout\n", stderr); - return res; -} -#endif /* defined TEST_NTPDSIM_OPTS */ -/* extracted from optcode.tlib near line 657 */ - #if ENABLE_NLS #include #include @@ -1135,14 +1305,13 @@ AO_gettext(char const* pz) pzRes = strdup(pzRes); if (pzRes == NULL) { fputs(_("No memory for duping translated strings\n"), stderr); - exit(EXIT_FAILURE); + exit(NTPDSIM_EXIT_FAILURE); } return pzRes; } -static void coerce_it(void** s) { *s = AO_gettext(*s); } -#define COERSION(_f) \ - coerce_it((void*)&(ntpdsimOptions._f)) +static void coerce_it(void** s) { *s = AO_gettext(*s); +} /* * This invokes the translation code (e.g. gettext(3)). @@ -1150,6 +1319,8 @@ static void coerce_it(void** s) { *s = AO_gettext(*s); } static void translate_option_strings(void) { + tOptions * const pOpt = &ntpdsimOptions; + /* * Guard against re-translation. It won't work. The strings will have * been changed by the first pass through this code. One shot only. @@ -1159,33 +1330,33 @@ translate_option_strings(void) * Do the translations. The first pointer follows the field count * field. The field count field is the size of a pointer. */ - tOptDesc* pOD = ntpdsimOptions.pOptDesc; - char** ppz = (char**)(void*)&(option_usage_text); - int ix = option_usage_text.field_ct; + tOptDesc * pOD = pOpt->pOptDesc; + char ** ppz = (char**)(void*)&(option_usage_text); + int ix = option_usage_text.field_ct; do { ppz++; *ppz = AO_gettext(*ppz); } while (--ix > 0); - COERSION(pzCopyright); - COERSION(pzCopyNotice); - COERSION(pzFullVersion); - COERSION(pzUsageTitle); - COERSION(pzExplain); - COERSION(pzDetail); - COERSION(pzPackager); + coerce_it((void*)&(pOpt->pzCopyright)); + coerce_it((void*)&(pOpt->pzCopyNotice)); + coerce_it((void*)&(pOpt->pzFullVersion)); + coerce_it((void*)&(pOpt->pzUsageTitle)); + coerce_it((void*)&(pOpt->pzExplain)); + coerce_it((void*)&(pOpt->pzDetail)); + coerce_it((void*)&(pOpt->pzPackager)); option_usage_text.field_ct = 0; - for (ix = ntpdsimOptions.optCt; ix > 0; ix--, pOD++) + for (ix = pOpt->optCt; ix > 0; ix--, pOD++) coerce_it((void*)&(pOD->pzText)); } - if ((ntpdsimOptions.fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) { - tOptDesc* pOD = ntpdsimOptions.pOptDesc; - int ix; + if ((pOpt->fOptSet & OPTPROC_NXLAT_OPT_CFG) == 0) { + tOptDesc * pOD = pOpt->pOptDesc; + int ix; - for (ix = ntpdsimOptions.optCt; ix > 0; ix--, pOD++) { + for (ix = pOpt->optCt; ix > 0; ix--, pOD++) { coerce_it((void*)&(pOD->pz_Name)); coerce_it((void*)&(pOD->pz_DisableName)); coerce_it((void*)&(pOD->pz_DisablePfx)); diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h index 9ee9264b91..f85fecd3ce 100644 --- a/ntpd/ntpdsim-opts.h +++ b/ntpd/ntpdsim-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdsim-opts.h) * - * It has been AutoGen-ed February 22, 2011 at 12:29:00 AM by AutoGen 5.11.6 + * It has been AutoGen-ed May 1, 2012 at 09:18:07 AM by AutoGen 5.16pre31 * From the definitions ntpdsim-opts.def * and the template file options * - * Generated from AutoOpts 34:0:9 templates. + * Generated from AutoOpts 36:4:11 templates. * * AutoOpts is a copyrighted work. This header file is not encumbered * by AutoOpts licensing, but is provided under the licensing terms chosen @@ -15,11 +15,25 @@ * users discretion, the BSD license. See the AutoOpts and/or libopts sources * for details. * - * This source file is copyrighted and licensed under the following terms: + * The ntpdsim program is copyrighted and licensed + * under the following terms: * - * ntpdsim copyright (c) 1970-2011 David L. Mills and/or others - all rights reserved + * Copyright (C) 1970-2012 The University of Delaware, all rights reserved. + * This is free software. It is licensed for use, modification and + * redistribution under the terms of the NTP License, copies of which + * can be seen at: + * + * * - * see html/copyright.html + * Permission to use, copy, modify, and distribute this software and its + * documentation for any purpose with or without fee is hereby granted, + * provided that the above copyright notice appears in all copies and that + * both the copyright notice and this permission notice appear in + * supporting documentation, and that the name The University of Delaware not be used in + * advertising or publicity pertaining to distribution of the software + * without specific, written prior permission. The University of Delaware makes no + * representations about the suitability this software for any purpose. It + * is provided "as is" without express or implied warranty. */ /* * This file contains the programmatic interface to the Automated @@ -39,7 +53,7 @@ * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 139264 +#define AO_TEMPLATE_VERSION 147460 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -79,19 +93,20 @@ typedef enum { INDEX_OPT_UPDATEINTERVAL = 26, INDEX_OPT_VAR = 27, INDEX_OPT_DVAR = 28, - INDEX_OPT_SLEW = 29, - INDEX_OPT_USEPCC = 30, - INDEX_OPT_PCCFREQ = 31, - INDEX_OPT_VERSION = 32, - INDEX_OPT_HELP = 33, - INDEX_OPT_MORE_HELP = 34, - INDEX_OPT_SAVE_OPTS = 35, - INDEX_OPT_LOAD_OPTS = 36 + INDEX_OPT_WAIT_SYNC = 29, + INDEX_OPT_SLEW = 30, + INDEX_OPT_USEPCC = 31, + INDEX_OPT_PCCFREQ = 32, + INDEX_OPT_VERSION = 33, + INDEX_OPT_HELP = 34, + INDEX_OPT_MORE_HELP = 35, + INDEX_OPT_SAVE_OPTS = 36, + INDEX_OPT_LOAD_OPTS = 37 } teOptIndex; -#define OPTION_CT 37 -#define NTPDSIM_VERSION "4.2.6p3" -#define NTPDSIM_FULL_VERSION "ntpdsim - NTP daemon simulation program - Ver. 4.2.6p3" +#define OPTION_CT 38 +#define NTPDSIM_VERSION "4.2.7p272" +#define NTPDSIM_FULL_VERSION "ntpdsim 4.2.7p272" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -120,9 +135,10 @@ typedef enum { */ typedef enum { NTPDSIM_EXIT_SUCCESS = 0, - NTPDSIM_EXIT_FAILURE = 1 + NTPDSIM_EXIT_FAILURE = 1, + NTPDSIM_EXIT_NO_CONFIG_INPUT = 66, + NTPDSIM_EXIT_LIBOPTS_FAILURE = 70 } ntpdsim_exit_code_t; - /* * Make sure there are no #define name conflicts with the option names */ @@ -243,6 +259,10 @@ typedef enum { # warning undefining DVAR due to option name conflict # undef DVAR # endif +# ifdef WAIT_SYNC +# warning undefining WAIT_SYNC due to option name conflict +# undef WAIT_SYNC +# endif # ifdef SLEW # warning undefining SLEW due to option name conflict # undef SLEW @@ -285,6 +305,7 @@ typedef enum { # undef UPDATEINTERVAL # undef VAR # undef DVAR +# undef WAIT_SYNC # undef SLEW # undef USEPCC # undef PCCFREQ @@ -327,9 +348,13 @@ typedef enum { #define OPT_VALUE_UPDATEINTERVAL (DESC(UPDATEINTERVAL).optArg.argInt) #define VALUE_OPT_VAR 27 #define VALUE_OPT_DVAR 28 +#define VALUE_OPT_WAIT_SYNC 'w' +#ifdef HAVE_WORKING_FORK +#define OPT_VALUE_WAIT_SYNC (DESC(WAIT_SYNC).optArg.argInt) +#endif /* HAVE_WORKING_FORK */ #define VALUE_OPT_SLEW 'x' -#define VALUE_OPT_USEPCC 30 -#define VALUE_OPT_PCCFREQ 31 +#define VALUE_OPT_USEPCC 31 +#define VALUE_OPT_PCCFREQ 32 #define VALUE_OPT_HELP '?' #define VALUE_OPT_MORE_HELP '!' #define VALUE_OPT_VERSION INDEX_OPT_VERSION @@ -349,25 +374,26 @@ typedef enum { ntpdsimOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdsimOptions.pUsageProc)(&ntpdsimOptions, c) -/* extracted from opthead.tlib near line 435 */ +/* extracted from opthead.tlib near line 484 */ -/* * * * * * - * - * Declare the ntpdsim option descriptor. - */ #ifdef __cplusplus extern "C" { #endif -extern tOptions ntpdsimOptions; + +/* * * * * * + * + * Declare the ntpdsim option descriptor. + */ +extern tOptions ntpdsimOptions; #if defined(ENABLE_NLS) # ifndef _ # include - static inline char* aoGetsText(char const* pz) { - if (pz == NULL) return NULL; - return (char*)gettext(pz); - } +static inline char* aoGetsText(char const* pz) { + if (pz == NULL) return NULL; + return (char*)gettext(pz); +} # define _(s) aoGetsText(s) # endif /* _() */ diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi index fc4207bfaf..87dee0f058 100644 --- a/ntpdc/invoke-ntpdc.texi +++ b/ntpdc/invoke-ntpdc.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpdc.texi) # -# It has been AutoGen-ed April 14, 2012 at 12:22:39 AM by AutoGen 5.16pre18 +# It has been AutoGen-ed April 17, 2012 at 02:12:59 AM by AutoGen 5.16pre23 # From the definitions ntpdc-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -51,7 +51,7 @@ with a status code of 0. @exampleindent 0 @example -ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p272 +ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p271 USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi index 55cb707ccf..bea91c16c6 100644 --- a/ntpq/invoke-ntpq.texi +++ b/ntpq/invoke-ntpq.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpq.texi) # -# It has been AutoGen-ed April 14, 2012 at 12:22:51 AM by AutoGen 5.16pre18 +# It has been AutoGen-ed April 17, 2012 at 02:13:13 AM by AutoGen 5.16pre23 # From the definitions ntpq-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -44,7 +44,7 @@ with a status code of 0. @exampleindent 0 @example -ntpq - standard NTP query program - Ver. 4.2.7p272 +ntpq - standard NTP query program - Ver. 4.2.7p271 USAGE: ntpq [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi index 6902b1eda1..dac9e133ed 100644 --- a/ntpsnmpd/invoke-ntpsnmpd.texi +++ b/ntpsnmpd/invoke-ntpsnmpd.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntpsnmpd.texi) # -# It has been AutoGen-ed April 14, 2012 at 12:22:53 AM by AutoGen 5.16pre18 +# It has been AutoGen-ed April 17, 2012 at 02:13:15 AM by AutoGen 5.16pre23 # From the definitions ntpsnmpd-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -41,30 +41,8 @@ with a status code of 0. @exampleindent 0 @example -USAGE: ntpsnmpd [ - [] | --[@{=| @}] ]... - Flg Arg Option-Name Description - -n no nofork Do not fork - -p no syslog Log to syslog() - Str agentxsocket The socket address ntpsnmpd uses to connect to net-snmpd - opt version Output version information and exit - -? no help Display extended usage information and exit - -! no more-help Extended usage information passed thru pager - -> opt save-opts Save the option state to a config file - -< Str load-opts Load options from a config file - - disabled as --no-load-opts - - may appear multiple times - -Options are specified by doubled hyphens and their name or by a single -hyphen and the flag character. - - - -The following option preset mechanisms are supported: - - reading file $HOME/.ntprc - - reading file ./.ntprc - - examining environment variables named NTPSNMPD_* - -please send bug reports to: http://bugs.ntp.org, bugs@@ntp.org +ntpsnmpd is unavailable - no -? +@end example @exampleindent 4 @node ntpsnmpd agentxsocket diff --git a/scripts/invoke-ntp-wait.texi b/scripts/invoke-ntp-wait.texi index 27ed55691d..a533f9beb2 100644 --- a/scripts/invoke-ntp-wait.texi +++ b/scripts/invoke-ntp-wait.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp-wait.texi) # -# It has been AutoGen-ed April 14, 2012 at 12:21:38 AM by AutoGen 5.16pre18 +# It has been AutoGen-ed April 17, 2012 at 02:11:22 AM by AutoGen 5.16pre23 # From the definitions ntp-wait-opts.def # and the template file agtexi-cmd.tpl @end ignore diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi index 46f726274c..ec437d63e7 100644 --- a/sntp/invoke-sntp.texi +++ b/sntp/invoke-sntp.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-sntp.texi) # -# It has been AutoGen-ed April 14, 2012 at 12:23:04 AM by AutoGen 5.16pre18 +# It has been AutoGen-ed April 17, 2012 at 02:13:40 AM by AutoGen 5.16pre23 # From the definitions sntp-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -99,7 +99,7 @@ with a status code of 0. @exampleindent 0 @example -sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p272 +sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p271 USAGE: sntp [ - [] | --[@{=| @}] ]... \ [ hostname-or-IP ...] Flg Arg Option-Name Description @@ -109,7 +109,7 @@ USAGE: sntp [ - [] | --[@{=| @}] ]... \ -6 no ipv6 Force IPv6 DNS name resolution - prohibits these options: ipv4 - -a Num authentication Enable authentication with the key @@var@{auth-keynumber@} + -a Num authentication Enable authentication with the key auth-keynumber -B Num bctimeout The number of seconds to wait for broadcasts -b Str broadcast Listen to the address specified for broadcast time sync - may appear multiple times @@ -121,17 +121,17 @@ USAGE: sntp [ - [] | --[@{=| @}] ]... \ - may appear multiple times -g Num gap The gap (in milliseconds) between time requests -K Fil kod KoD history filename - -k Fil keyfile Look in this file for the key specified with @@option@{-a@} + -k Fil keyfile Look in this file for the key specified with -a -l Fil logfile Log to specified logfile - -M Num steplimit Adjustments less than @@var@{steplimit@} msec will be slewed + -M Num steplimit Adjustments less than steplimit msec will be slewed - It must be in the range: greater than or equal to 0 - -o Num ntpversion Send @@var@{int@} as our NTP version + -o Num ntpversion Send int as our NTP version - It must be in the range: 0 to 7 -r no usereservedport Use the NTP Reserved Port (port 123) - -S no step OK to 'step' the time with @@command@{settimeofday(2)@} - -s no slew OK to 'slew' the time with @@command@{adjtime(2)@} + -S no step OK to 'step' the time with settimeofday(2) + -s no slew OK to 'slew' the time with adjtime(2) -u Num uctimeout The number of seconds to wait for unicast responses no wait Wait for pending replies (if not setting the time) - disabled as --no-wait diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi index 3b0d0e6ea1..6481ca54b7 100644 --- a/util/invoke-ntp-keygen.texi +++ b/util/invoke-ntp-keygen.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (invoke-ntp-keygen.texi) # -# It has been AutoGen-ed April 14, 2012 at 12:22:58 AM by AutoGen 5.16pre18 +# It has been AutoGen-ed April 17, 2012 at 02:13:23 AM by AutoGen 5.16pre23 # From the definitions ntp-keygen-opts.def # and the template file agtexi-cmd.tpl @end ignore @@ -60,7 +60,7 @@ with a status code of 0. @exampleindent 0 @example -ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p272 +ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p271 USAGE: ntp-keygen [ - [] | --[@{=| @}] ]... Flg Arg Option-Name Description -c Str certificate certificate scheme