From: Harlan Stenn Date: Wed, 25 Jan 2012 12:05:43 +0000 (+0000) Subject: NTP_4_2_7P252 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47935ab589d8a31e91a5a78cde01eb245c8eca4d;p=thirdparty%2Fntp.git NTP_4_2_7P252 bk: 4f1ff017XCQRQgLguOunf_qNOK6iUA --- diff --git a/ChangeLog b/ChangeLog index 75b2c5b5ed..002ec8426c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p252) 2012/01/25 Released by Harlan Stenn * Upgrade to autogen-5.14 (and libopts-36.1.11). (4.2.7p251) 2012/01/17 Released by Harlan Stenn * [Bug 2115] ntptrace should accept both rootdispersion and rootdisp. diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 020d39510d..675eca3e1f 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed January 17, 2012 at 11:33:04 AM by AutoGen 5.12 + * It has been AutoGen-ed January 25, 2012 at 12:02:00 PM by AutoGen 5.14 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 35:0:10 templates. + * Generated from AutoOpts 36:1: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,7 +15,8 @@ * 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 ntpd program is copyrighted and licensed + * under the following terms: * * Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved. * This is free software. It is licensed for use, modification and @@ -23,8 +24,8 @@ * can be seen at: * * - * -PFX>Permission to use, copy, modify, and distribute this software and its + * + * 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 @@ -43,7 +44,6 @@ PFX>Permission to use, copy, modify, and distribute this software and its #define OPTION_CODE_COMPILE 1 #include "ntpd-opts.h" - #ifdef __cplusplus extern "C" { #endif @@ -51,32 +51,13 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ -static char const zCopyright[333] = -"ntpd 4.2.7p251\n\ -Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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"; -static char const zLicenseDescrip[700] = -"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, David L.\n\ -Mills, and/or others not be used in advertising or publicity pertaining to\n\ -distribution of the software without specific, written prior permission.\n\ -The University of Delaware, David L. Mills, and/or others makes no\n\ -representations about the suitability this software for any purpose. It is\n\ -provided \"as is\" without express or implied warranty.\n"; +#define zCopyright (ntpd_opt_strs+0) +#define zLicenseDescrip (ntpd_opt_strs+333) extern tUsageProc optionUsage; - /* * global included definitions - */ -#ifdef __windows + */#ifdef __windows extern int atoi(const char *); #else # include @@ -87,454 +68,548 @@ extern tUsageProc optionUsage; #endif /* - * Ipv4 option description with + * ntpd option static const strings + */ +static char const ntpd_opt_strs[3089] = +/* 0 */ "ntpd 4.2.7p252\n" + "Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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" +/* 333 */ "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, David L.\n" + "Mills, and/or others not be used in advertising or publicity pertaining to\n" + "distribution of the software without specific, written prior permission.\n" + "The University of Delaware, David L. Mills, and/or others 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" +/* 1033 */ "Force IPv4 DNS name resolution\0" +/* 1064 */ "IPV4\0" +/* 1069 */ "ipv4\0" +/* 1074 */ "Force IPv6 DNS name resolution\0" +/* 1105 */ "IPV6\0" +/* 1110 */ "ipv6\0" +/* 1115 */ "Require crypto authentication\0" +/* 1145 */ "AUTHREQ\0" +/* 1153 */ "authreq\0" +/* 1161 */ "Do not require crypto authentication\0" +/* 1198 */ "AUTHNOREQ\0" +/* 1208 */ "authnoreq\0" +/* 1218 */ "Allow us to sync to broadcast servers\0" +/* 1256 */ "BCASTSYNC\0" +/* 1266 */ "bcastsync\0" +/* 1276 */ "configuration file name\0" +/* 1300 */ "CONFIGFILE\0" +/* 1311 */ "configfile\0" +/* 1322 */ "Increase output debug message level\0" +/* 1358 */ "DEBUG_LEVEL\0" +/* 1370 */ "debug-level\0" +/* 1382 */ "this package was built using 'configure --disable--debug'\0" +/* 1440 */ "Set the output debug message level\0" +/* 1475 */ "SET_DEBUG_LEVEL\0" +/* 1491 */ "set-debug-level\0" +/* 1507 */ "frequency drift file name\0" +/* 1533 */ "DRIFTFILE\0" +/* 1543 */ "driftfile\0" +/* 1553 */ "Allow the first adjustment to be Big\0" +/* 1590 */ "PANICGATE\0" +/* 1600 */ "panicgate\0" +/* 1610 */ "Jail directory\0" +/* 1625 */ "JAILDIR\0" +/* 1633 */ "jaildir\0" +/* 1641 */ "built without --enable-clockctl or --enable-linuxcaps\0" +/* 1695 */ "Listen on an interface name or address\0" +/* 1734 */ "INTERFACE\0" +/* 1744 */ "interface\0" +/* 1754 */ "path to symmetric keys\0" +/* 1777 */ "KEYFILE\0" +/* 1785 */ "keyfile\0" +/* 1793 */ "path to the log file\0" +/* 1814 */ "LOGFILE\0" +/* 1822 */ "logfile\0" +/* 1830 */ "Do not listen to virtual interfaces\0" +/* 1866 */ "NOVIRTUALIPS\0" +/* 1879 */ "novirtualips\0" +/* 1892 */ "Modify Multimedia Timer (Windows only)\0" +/* 1931 */ "MODIFYMMTIMER\0" +/* 1945 */ "modifymmtimer\0" +/* 1959 */ "Do not fork\0" +/* 1971 */ "NOFORK\0" +/* 1978 */ "nofork\0" +/* 1985 */ "Run at high priority\0" +/* 2006 */ "NICE\0" +/* 2011 */ "nice\0" +/* 2016 */ "path to the PID file\0" +/* 2037 */ "PIDFILE\0" +/* 2045 */ "pidfile\0" +/* 2053 */ "Process priority\0" +/* 2070 */ "PRIORITY\0" +/* 2079 */ "priority\0" +/* 2088 */ "Set the time and quit\0" +/* 2110 */ "QUIT\0" +/* 2115 */ "quit\0" +/* 2120 */ "Broadcast/propagation delay\0" +/* 2148 */ "PROPAGATIONDELAY\0" +/* 2165 */ "propagationdelay\0" +/* 2182 */ "Save parsed configuration and quit\0" +/* 2217 */ "SAVECONFIGQUIT\0" +/* 2232 */ "saveconfigquit\0" +/* 2247 */ "Statistics file location\0" +/* 2272 */ "STATSDIR\0" +/* 2281 */ "statsdir\0" +/* 2290 */ "Trusted key number\0" +/* 2309 */ "TRUSTEDKEY\0" +/* 2320 */ "trustedkey\0" +/* 2331 */ "Run as userid (or userid:groupid)\0" +/* 2365 */ "USER\0" +/* 2370 */ "user\0" +/* 2375 */ "interval in seconds between scans for new or dropped interfaces\0" +/* 2439 */ "UPDATEINTERVAL\0" +/* 2454 */ "updateinterval\0" +/* 2469 */ "make ARG an ntp variable (RW)\0" +/* 2499 */ "VAR\0" +/* 2503 */ "var\0" +/* 2507 */ "make ARG an ntp variable (RW|DEF)\0" +/* 2541 */ "DVAR\0" +/* 2546 */ "dvar\0" +/* 2551 */ "Seconds to wait for first clock sync\0" +/* 2588 */ "WAIT_SYNC\0" +/* 2598 */ "wait-sync\0" +/* 2608 */ "Slew up to 600 seconds\0" +/* 2631 */ "SLEW\0" +/* 2636 */ "slew\0" +/* 2641 */ "Use CPU cycle counter (Windows only)\0" +/* 2678 */ "USEPCC\0" +/* 2685 */ "usepcc\0" +/* 2692 */ "Force CPU cycle counter use (Windows only)\0" +/* 2735 */ "PCCFREQ\0" +/* 2743 */ "pccfreq\0" +/* 2751 */ "Display extended usage information and exit\0" +/* 2795 */ "help\0" +/* 2800 */ "Extended usage information passed thru pager\0" +/* 2845 */ "more-help\0" +/* 2855 */ "Output version information and exit\0" +/* 2891 */ "version\0" +/* 2899 */ "NTPD\0" +/* 2904 */ "ntpd - NTP daemon program - Ver. 4.2.7p252\n" + "USAGE: %s [ - [] | --[{=| }] ]... \\\n" + "\t\t[ ... ]\n\0" +/* 3037 */ "http://bugs.ntp.org, bugs@ntp.org\0" +/* 3071 */ "\n\n\0" +/* 3074 */ "ntpd 4.2.7p252"; + +/* + * 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 (ntpd_opt_strs+1033) +#define IPV4_NAME (ntpd_opt_strs+1064) +#define IPV4_name (ntpd_opt_strs+1069) +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 (ntpd_opt_strs+1074) +#define IPV6_NAME (ntpd_opt_strs+1105) +#define IPV6_name (ntpd_opt_strs+1110) +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 (ntpd_opt_strs+1115) +#define AUTHREQ_NAME (ntpd_opt_strs+1145) +#define AUTHREQ_name (ntpd_opt_strs+1153) +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 (ntpd_opt_strs+1161) +#define AUTHNOREQ_NAME (ntpd_opt_strs+1198) +#define AUTHNOREQ_name (ntpd_opt_strs+1208) +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 (ntpd_opt_strs+1218) +#define BCASTSYNC_NAME (ntpd_opt_strs+1256) +#define BCASTSYNC_name (ntpd_opt_strs+1266) +#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 (ntpd_opt_strs+1276) +#define CONFIGFILE_NAME (ntpd_opt_strs+1300) +#define CONFIGFILE_name (ntpd_opt_strs+1311) +#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 (ntpd_opt_strs+1322) +#define DEBUG_LEVEL_NAME (ntpd_opt_strs+1358) +#define DEBUG_LEVEL_name (ntpd_opt_strs+1370) +#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 (ntpd_opt_strs+1382) +#define DEBUG_LEVEL_name (ntpd_opt_strs+1370) #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 (ntpd_opt_strs+1440) +#define SET_DEBUG_LEVEL_NAME (ntpd_opt_strs+1475) +#define SET_DEBUG_LEVEL_name (ntpd_opt_strs+1491) +#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 (ntpd_opt_strs+1382) +#define SET_DEBUG_LEVEL_name (ntpd_opt_strs+1491) #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 (ntpd_opt_strs+1507) +#define DRIFTFILE_NAME (ntpd_opt_strs+1533) +#define DRIFTFILE_name (ntpd_opt_strs+1543) +#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 (ntpd_opt_strs+1553) +#define PANICGATE_NAME (ntpd_opt_strs+1590) +#define PANICGATE_name (ntpd_opt_strs+1600) +#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 (ntpd_opt_strs+1610) +#define JAILDIR_NAME (ntpd_opt_strs+1625) +#define JAILDIR_name (ntpd_opt_strs+1633) +#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 (ntpd_opt_strs+1641) +#define JAILDIR_name (ntpd_opt_strs+1633) #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 (ntpd_opt_strs+1695) +#define INTERFACE_NAME (ntpd_opt_strs+1734) +#define INTERFACE_name (ntpd_opt_strs+1744) +#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 (ntpd_opt_strs+1754) +#define KEYFILE_NAME (ntpd_opt_strs+1777) +#define KEYFILE_name (ntpd_opt_strs+1785) +#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 (ntpd_opt_strs+1793) +#define LOGFILE_NAME (ntpd_opt_strs+1814) +#define LOGFILE_name (ntpd_opt_strs+1822) +#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 (ntpd_opt_strs+1830) +#define NOVIRTUALIPS_NAME (ntpd_opt_strs+1866) +#define NOVIRTUALIPS_name (ntpd_opt_strs+1879) +#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 (ntpd_opt_strs+1892) +#define MODIFYMMTIMER_NAME (ntpd_opt_strs+1931) +#define MODIFYMMTIMER_name (ntpd_opt_strs+1945) +#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 with + * 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"; -static const int - aNoforkCantList[] = { +#define NOFORK_DESC (ntpd_opt_strs+1959) +#define NOFORK_NAME (ntpd_opt_strs+1971) +#define NOFORK_name (ntpd_opt_strs+1978) +static int const aNoforkCantList[] = { INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; -#define NOFORK_FLAGS (OPTST_DISABLED) +#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 (ntpd_opt_strs+1985) +#define NICE_NAME (ntpd_opt_strs+2006) +#define NICE_name (ntpd_opt_strs+2011) +#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 (ntpd_opt_strs+2016) +#define PIDFILE_NAME (ntpd_opt_strs+2037) +#define PIDFILE_name (ntpd_opt_strs+2045) +#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 (ntpd_opt_strs+2053) +#define PRIORITY_NAME (ntpd_opt_strs+2070) +#define PRIORITY_name (ntpd_opt_strs+2079) +#define PRIORITY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* - * Quit option description with + * 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"; -static const int - aQuitCantList[] = { +#define QUIT_DESC (ntpd_opt_strs+2088) +#define QUIT_NAME (ntpd_opt_strs+2110) +#define QUIT_name (ntpd_opt_strs+2115) +static int const aQuitCantList[] = { INDEX_OPT_SAVECONFIGQUIT, INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; -#define QUIT_FLAGS (OPTST_DISABLED) +#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 (ntpd_opt_strs+2120) +#define PROPAGATIONDELAY_NAME (ntpd_opt_strs+2148) +#define PROPAGATIONDELAY_name (ntpd_opt_strs+2165) +#define PROPAGATIONDELAY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Saveconfigquit option description with + * 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"; -static const int - aSaveconfigquitCantList[] = { +#define SAVECONFIGQUIT_DESC (ntpd_opt_strs+2182) +#define SAVECONFIGQUIT_NAME (ntpd_opt_strs+2217) +#define SAVECONFIGQUIT_name (ntpd_opt_strs+2232) +static int const aSaveconfigquitCantList[] = { INDEX_OPT_QUIT, INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; -#define SAVECONFIGQUIT_FLAGS (OPTST_DISABLED \ +#define SAVECONFIGQUIT_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) -#else /* disable Saveconfigquit */ -#define SAVECONFIGQUIT_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) +#else /* disable saveconfigquit */ +#define SAVECONFIGQUIT_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) #define aSaveconfigquitCantList NULL -#define zSaveconfigquit_NAME NULL -#define zSaveconfigquitText NULL -#define zSaveconfigquit_Name 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 (ntpd_opt_strs+2247) +#define STATSDIR_NAME (ntpd_opt_strs+2272) +#define STATSDIR_name (ntpd_opt_strs+2281) +#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 (ntpd_opt_strs+2290) +#define TRUSTEDKEY_NAME (ntpd_opt_strs+2309) +#define TRUSTEDKEY_name (ntpd_opt_strs+2320) +#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 (ntpd_opt_strs+2331) +#define USER_NAME (ntpd_opt_strs+2365) +#define USER_name (ntpd_opt_strs+2370) +#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 (ntpd_opt_strs+1641) +#define USER_name (ntpd_opt_strs+2370) #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 (ntpd_opt_strs+2375) +#define UPDATEINTERVAL_NAME (ntpd_opt_strs+2439) +#define UPDATEINTERVAL_name (ntpd_opt_strs+2454) +#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 (ntpd_opt_strs+2469) +#define VAR_NAME (ntpd_opt_strs+2499) +#define VAR_name (ntpd_opt_strs+2503) +#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 (ntpd_opt_strs+2507) +#define DVAR_NAME (ntpd_opt_strs+2541) +#define DVAR_name (ntpd_opt_strs+2546) +#define DVAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Wait_Sync option description with + * wait-sync option description with * "Must also have options" and "Incompatible options": */ #ifdef HAVE_WORKING_FORK -static char const zWait_SyncText[] = - "Seconds to wait for first clock sync"; -static char const zWait_Sync_NAME[] = "WAIT_SYNC"; -static char const zWait_Sync_Name[] = "wait-sync"; -static const int - aWait_SyncCantList[] = { +#define WAIT_SYNC_DESC (ntpd_opt_strs+2551) +#define WAIT_SYNC_NAME (ntpd_opt_strs+2588) +#define WAIT_SYNC_name (ntpd_opt_strs+2598) +static int const aWait_SyncCantList[] = { INDEX_OPT_NOFORK, INDEX_OPT_QUIT, INDEX_OPT_SAVECONFIGQUIT, NO_EQUIVALENT }; -#define WAIT_SYNC_FLAGS (OPTST_DISABLED \ +#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) +#else /* disable wait-sync */ +#define WAIT_SYNC_FLAGS (OPTST_OMITTED | OPTST_NO_INIT) #define aWait_SyncCantList NULL -#define zWait_Sync_NAME NULL -#define zWait_SyncText NULL -#define zWait_Sync_Name NULL +#define WAIT_SYNC_NAME NULL +#define WAIT_SYNC_DESC NULL +#define WAIT_SYNC_name NULL #endif /* HAVE_WORKING_FORK */ /* - * Slew option description: + * 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 (ntpd_opt_strs+2608) +#define SLEW_NAME (ntpd_opt_strs+2631) +#define SLEW_name (ntpd_opt_strs+2636) +#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 (ntpd_opt_strs+2641) +#define USEPCC_NAME (ntpd_opt_strs+2678) +#define USEPCC_name (ntpd_opt_strs+2685) +#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 (ntpd_opt_strs+2692) +#define PCCFREQ_NAME (ntpd_opt_strs+2735) +#define PCCFREQ_name (ntpd_opt_strs+2743) +#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 (ntpd_opt_strs+2751) +#define HELP_name (ntpd_opt_strs+2795) #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 (ntpd_opt_strs+2800) +#define MORE_HELP_name (ntpd_opt_strs+2845) +#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"; +#define VER_DESC (ntpd_opt_strs+2855) +#define VER_name (ntpd_opt_strs+2891) /* * Declare option callback procedures */ @@ -565,7 +640,7 @@ extern tOptProc optionBooleanVal, optionNestedVal, optionNumericVal, optionPagedUsage, optionPrintVersion, optionResetOpt, optionStackArg, optionTimeDate, optionTimeVal, - optionUnstackArg, optionVersionStderr; + optionUnstackArg, optionVendorOption, optionVersionStderr; static tOptProc doUsageOpt; @@ -577,9 +652,9 @@ static tOptProc #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level #endif /* defined(TEST_NTPD_OPTS) */ #ifdef TEST_NTPD_OPTS -# define DOVERPROC optionVersionStderr +# define VER_PROC optionVersionStderr #else -# define DOVERPROC optionPrintVersion +# define VER_PROC optionPrintVersion #endif /* TEST_NTPD_OPTS */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -592,11 +667,11 @@ 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 }, /* --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, @@ -604,11 +679,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, @@ -616,11 +691,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, @@ -628,11 +703,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, @@ -640,11 +715,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, @@ -652,11 +727,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, @@ -664,11 +739,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, @@ -676,11 +751,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, @@ -688,11 +763,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, @@ -700,11 +775,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, @@ -712,11 +787,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, @@ -724,11 +799,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, @@ -736,11 +811,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, @@ -748,11 +823,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, @@ -760,11 +835,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, @@ -772,11 +847,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, @@ -784,11 +859,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, 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, @@ -796,11 +871,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, @@ -808,11 +883,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, @@ -820,11 +895,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, @@ -832,11 +907,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, 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, @@ -844,11 +919,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, @@ -856,11 +931,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, 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, @@ -868,11 +943,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, @@ -880,11 +955,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, @@ -892,11 +967,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, @@ -904,11 +979,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, @@ -916,11 +991,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, @@ -928,11 +1003,11 @@ 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_WAIT_SYNC, @@ -940,11 +1015,11 @@ static tOptDesc optDesc[OPTION_CT] = { /* equivalenced to */ NO_EQUIVALENT, /* min, max, act ct */ 0, 1, 0, /* opt state flags */ WAIT_SYNC_FLAGS, 0, - /* last opt argumnt */ { NULL }, + /* last opt argumnt */ { NULL }, /* --wait-sync */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aWait_SyncCantList, /* option proc */ optionNumericVal, - /* desc, NAME, name */ zWait_SyncText, zWait_Sync_NAME, zWait_Sync_Name, + /* desc, NAME, name */ WAIT_SYNC_DESC, WAIT_SYNC_NAME, WAIT_SYNC_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 30, VALUE_OPT_SLEW, @@ -952,11 +1027,11 @@ 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 }, /* --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 */ 31, VALUE_OPT_USEPCC, @@ -964,11 +1039,11 @@ static tOptDesc optDesc[OPTION_CT] = { /* 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 */ 32, VALUE_OPT_PCCFREQ, @@ -976,29 +1051,29 @@ static tOptDesc optDesc[OPTION_CT] = { /* 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, @@ -1006,39 +1081,36 @@ 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 } }; + /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * Define the Ntpd Option Environment */ -static char const zPROGNAME[5] = "NTPD"; -static char const zUsageTitle[133] = -"ntpd - NTP daemon program - Ver. 4.2.7p251\n\ -USAGE: %s [ - [] | --[{=| }] ]... \\\n\ -\t\t[ ... ]\n"; -#define zRcName NULL -#define apzHomeList NULL - -static char const zBugsAddr[34] = "http://bugs.ntp.org, bugs@ntp.org"; -static char const zExplain[] = "\n\n"; -#define zDetail NULL -static char const zFullVersion[] = NTPD_FULL_VERSION; -/* extracted from optcode.tlib near line 515 */ +#define zPROGNAME (ntpd_opt_strs+2899) +#define zUsageTitle (ntpd_opt_strs+2904) +#define zRcName NULL +#define apzHomeList NULL +#define zBugsAddr (ntpd_opt_strs+3037) +#define zExplain (ntpd_opt_strs+3071) +#define zDetail (NULL) +#define zFullVersion (ntpd_opt_strs+3074) +/* extracted from optcode.tlib near line 315 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -1049,8 +1121,55 @@ static char const zFullVersion[] = NTPD_FULL_VERSION; #endif /* ENABLE_NLS */ -#define ntpd_full_usage NULL -#define ntpd_short_usage NULL +#define ntpd_full_usage (NULL) + +#define ntpd_short_usage (NULL) + +/* + * Create the static procedure(s) declared above. + */ +static void +doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc) +{ + (void)pOptions; + USAGE(NTPD_EXIT_SUCCESS); +} + +#if ! defined(TEST_NTPD_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_NTPD_OPTS) */ +/* extracted from optmain.tlib near line 128 */ + +#if defined(TEST_NTPD_OPTS) /* TEST MAIN PROCEDURE: */ + +extern void optionPutShell(tOptions*); + +int +main(int argc, char ** argv) +{ + int res = NTPD_EXIT_SUCCESS; + (void)optionProcess(&ntpdOptions, argc, argv); + optionPutShell(&ntpdOptions); + res = ferror(stdout); + if (res != 0) + fputs("output error writing to stdout\n", stderr); + return res; +} +#endif /* defined TEST_NTPD_OPTS */ +/* extracted from optmain.tlib near line 1148 */ + #ifndef PKGDATADIR # define PKGDATADIR "" #endif @@ -1104,51 +1223,6 @@ tOptions ntpdOptions = { PKGDATADIR, ntpd_packager_info }; -/* - * Create the static procedure(s) declared above. - */ -static void -doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc) -{ - (void)pOptions; - USAGE(NTPD_EXIT_SUCCESS); -} - -#if ! defined(TEST_NTPD_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_NTPD_OPTS) */ -/* extracted from optmain.tlib near line 128 */ - -#if defined(TEST_NTPD_OPTS) /* TEST MAIN PROCEDURE: */ - -extern void optionPutShell(tOptions*); - -int -main(int argc, char ** argv) -{ - int res = NTPD_EXIT_SUCCESS; - (void)optionProcess(&ntpdOptions, argc, argv); - optionPutShell(&ntpdOptions); - res = ferror(stdout); - if (res != 0) - fputs("output error writing to stdout\n", stderr); - return res; -} -#endif /* defined TEST_NTPD_OPTS */ -/* extracted from optcode.tlib near line 666 */ - #if ENABLE_NLS #include #include diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 84ec787574..9932236ff0 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed January 17, 2012 at 11:33:04 AM by AutoGen 5.12 + * It has been AutoGen-ed January 25, 2012 at 12:02:00 PM by AutoGen 5.14 * From the definitions ntpd-opts.def * and the template file options * - * Generated from AutoOpts 35:0:10 templates. + * Generated from AutoOpts 36:1: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,7 +15,8 @@ * 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 ntpd program is copyrighted and licensed + * under the following terms: * * Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved. * This is free software. It is licensed for use, modification and @@ -23,8 +24,8 @@ * can be seen at: * * - * -PFX>Permission to use, copy, modify, and distribute this software and its + * + * 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 @@ -52,7 +53,7 @@ PFX>Permission to use, copy, modify, and distribute this software and its * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 143360 +#define AO_TEMPLATE_VERSION 147457 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -102,8 +103,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 36 -#define NTPD_VERSION "4.2.7p251" -#define NTPD_FULL_VERSION "ntpd 4.2.7p251" +#define NTPD_VERSION "4.2.7p252" +#define NTPD_FULL_VERSION "ntpd 4.2.7p252" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -345,7 +346,6 @@ typedef enum { #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' @@ -364,12 +364,13 @@ typedef enum { ntpdOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdOptions.pUsageProc)(&ntpdOptions, c) -/* extracted from opthead.tlib near line 451 */ +/* extracted from opthead.tlib near line 469 */ #ifdef __cplusplus extern "C" { #endif + /* * * * * * * * Declare the ntpd option descriptor. diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index 36efb421f3..b5e6434c20 100644 --- a/ntpd/ntpd-opts.texi +++ b/ntpd/ntpd-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpd-opts.texi) # -# It has been AutoGen-ed January 17, 2012 at 11:33:20 AM by AutoGen 5.12 +# It has been AutoGen-ed January 25, 2012 at 12:03:54 PM by AutoGen 5.14 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -57,13 +57,13 @@ This software is released under a specialized copyright license. @node ntpd usage @subsection ntpd usage help (-?) -@cindex ntpd usage +@cindex ntpd-usage This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p251 +ntpd - NTP daemon program - Ver. 4.2.7p252 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index b7c557bc6d..2a75620c59 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "17 Jan 2012" "4.2.7p251" "User Commands" +.TH ntpd 1ntpdman "25 Jan 2012" "4.2.7p252" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed January 17, 2012 at 11:33:16 AM by AutoGen 5.12 +.\" It has been AutoGen-ed January 25, 2012 at 12:03:51 PM by AutoGen 5.14 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 9981e02f3a..2576132c20 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd January 17 2012 +.Dd January 25 2012 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed January 17, 2012 at 11:33:21 AM by AutoGen 5.12 +.\" It has been AutoGen-ed January 25, 2012 at 12:03:55 PM by AutoGen 5.14 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in index 275509e0a0..6256f8d9a2 100644 --- a/ntpd/ntpd.man.in +++ b/ntpd/ntpd.man.in @@ -1,8 +1,8 @@ -.TH ntpd @NTPD_MS@ "17 Jan 2012" "4.2.7p251" "User Commands" +.TH ntpd @NTPD_MS@ "25 Jan 2012" "4.2.7p252" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed January 17, 2012 at 11:33:16 AM by AutoGen 5.12 +.\" It has been AutoGen-ed January 25, 2012 at 12:03:51 PM by AutoGen 5.14 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in index e9faf0e810..99a8e194f0 100644 --- a/ntpd/ntpd.mdoc.in +++ b/ntpd/ntpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 17 2012 +.Dd January 25 2012 .Dt NTPD @NTPD_MS@ User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed January 17, 2012 at 11:33:21 AM by AutoGen 5.12 +.\" It has been AutoGen-ed January 25, 2012 at 12:03:55 PM by AutoGen 5.14 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index deab73a483..bb934df086 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed January 17, 2012 at 11:33:29 AM by AutoGen 5.12 + * It has been AutoGen-ed January 25, 2012 at 12:04:02 PM by AutoGen 5.14 * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 35:0:10 templates. + * Generated from AutoOpts 36:1: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,7 +15,8 @@ * 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 ntpdc program is copyrighted and licensed + * under the following terms: * * Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved. * This is free software. It is licensed for use, modification and @@ -23,8 +24,8 @@ * can be seen at: * * - * -PFX>Permission to use, copy, modify, and distribute this software and its + * + * 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 @@ -43,7 +44,6 @@ PFX>Permission to use, copy, modify, and distribute this software and its #define OPTION_CODE_COMPILE 1 #include "ntpdc-opts.h" - #ifdef __cplusplus extern "C" { #endif @@ -51,32 +51,13 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ -static char const zCopyright[334] = -"ntpdc 4.2.7p251\n\ -Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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"; -static char const zLicenseDescrip[700] = -"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, David L.\n\ -Mills, and/or others not be used in advertising or publicity pertaining to\n\ -distribution of the software without specific, written prior permission.\n\ -The University of Delaware, David L. Mills, and/or others makes no\n\ -representations about the suitability this software for any purpose. It is\n\ -provided \"as is\" without express or implied warranty.\n"; +#define zCopyright (ntpdc_opt_strs+0) +#define zLicenseDescrip (ntpdc_opt_strs+334) extern tUsageProc optionUsage; - /* * global included definitions - */ -#ifdef __windows + */#ifdef __windows extern int atoi(const char*); #else # include @@ -87,154 +68,209 @@ extern tUsageProc optionUsage; #endif /* - * Ipv4 option description with + * ntpdc option static const strings + */ +static char const ntpdc_opt_strs[1941] = +/* 0 */ "ntpdc 4.2.7p252\n" + "Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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" +/* 334 */ "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, David L.\n" + "Mills, and/or others not be used in advertising or publicity pertaining to\n" + "distribution of the software without specific, written prior permission.\n" + "The University of Delaware, David L. Mills, and/or others 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" +/* 1034 */ "Force IPv4 DNS name resolution\0" +/* 1065 */ "IPV4\0" +/* 1070 */ "ipv4\0" +/* 1075 */ "Force IPv6 DNS name resolution\0" +/* 1106 */ "IPV6\0" +/* 1111 */ "ipv6\0" +/* 1116 */ "run a command and exit\0" +/* 1139 */ "COMMAND\0" +/* 1147 */ "command\0" +/* 1155 */ "Increase debug verbosity level\0" +/* 1186 */ "DEBUG_LEVEL\0" +/* 1198 */ "debug-level\0" +/* 1210 */ "Set the debug verbosity level\0" +/* 1240 */ "SET_DEBUG_LEVEL\0" +/* 1256 */ "set-debug-level\0" +/* 1272 */ "Force ntpq to operate in interactive mode\0" +/* 1314 */ "INTERACTIVE\0" +/* 1326 */ "interactive\0" +/* 1338 */ "Print a list of the peers\0" +/* 1364 */ "LISTPEERS\0" +/* 1374 */ "listpeers\0" +/* 1384 */ "numeric host addresses\0" +/* 1407 */ "NUMERIC\0" +/* 1415 */ "numeric\0" +/* 1423 */ "PEERS\0" +/* 1429 */ "peers\0" +/* 1435 */ "Show a list of the peers\0" +/* 1460 */ "SHOWPEERS\0" +/* 1470 */ "showpeers\0" +/* 1480 */ "Display extended usage information and exit\0" +/* 1524 */ "help\0" +/* 1529 */ "Extended usage information passed thru pager\0" +/* 1574 */ "more-help\0" +/* 1584 */ "Output version information and exit\0" +/* 1620 */ "version\0" +/* 1628 */ "Save the option state to a config file\0" +/* 1667 */ "save-opts\0" +/* 1677 */ "Load options from a config file\0" +/* 1709 */ "LOAD_OPTS\0" +/* 1719 */ "no-load-opts\0" +/* 1732 */ "no\0" +/* 1735 */ "NTPDC\0" +/* 1741 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p252\n" + "USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n\0" +/* 1873 */ ".ntprc\0" +/* 1880 */ "$HOME\0" +/* 1886 */ ".\0" +/* 1888 */ "http://bugs.ntp.org, bugs@ntp.org\0" +/* 1922 */ "\n\n\0" +/* 1925 */ "ntpdc 4.2.7p252"; + +/* + * 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 (ntpdc_opt_strs+1034) +#define IPV4_NAME (ntpdc_opt_strs+1065) +#define IPV4_name (ntpdc_opt_strs+1070) +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 (ntpdc_opt_strs+1075) +#define IPV6_NAME (ntpdc_opt_strs+1106) +#define IPV6_name (ntpdc_opt_strs+1111) +static int const aIpv6CantList[] = { INDEX_OPT_IPV4, NO_EQUIVALENT }; -#define IPV6_FLAGS (OPTST_DISABLED) +#define IPV6_FLAGS (OPTST_DISABLED) /* - * Command option description: + * command option description: */ -static char const zCommandText[] = - "run a command and exit"; -static char const zCommand_NAME[] = "COMMAND"; -static char const zCommand_Name[] = "command"; -#define COMMAND_FLAGS (OPTST_DISABLED | OPTST_STACKED \ +#define COMMAND_DESC (ntpdc_opt_strs+1116) +#define COMMAND_NAME (ntpdc_opt_strs+1139) +#define COMMAND_name (ntpdc_opt_strs+1147) +#define COMMAND_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Debug_Level option description: + * debug-level option description: */ -static char const zDebug_LevelText[] = - "Increase debug verbosity level"; -static char const zDebug_Level_NAME[] = "DEBUG_LEVEL"; -static char const zDebug_Level_Name[] = "debug-level"; -#define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) +#define DEBUG_LEVEL_DESC (ntpdc_opt_strs+1155) +#define DEBUG_LEVEL_NAME (ntpdc_opt_strs+1186) +#define DEBUG_LEVEL_name (ntpdc_opt_strs+1198) +#define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) /* - * Set_Debug_Level option description: + * set-debug-level option description: */ -static char const zSet_Debug_LevelText[] = - "Set the debug verbosity 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 (ntpdc_opt_strs+1210) +#define SET_DEBUG_LEVEL_NAME (ntpdc_opt_strs+1240) +#define SET_DEBUG_LEVEL_name (ntpdc_opt_strs+1256) +#define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* - * Interactive option description with + * interactive option description with * "Must also have options" and "Incompatible options": */ -static char const zInteractiveText[] = - "Force ntpq to operate in interactive mode"; -static char const zInteractive_NAME[] = "INTERACTIVE"; -static char const zInteractive_Name[] = "interactive"; -static const int - aInteractiveCantList[] = { +#define INTERACTIVE_DESC (ntpdc_opt_strs+1272) +#define INTERACTIVE_NAME (ntpdc_opt_strs+1314) +#define INTERACTIVE_name (ntpdc_opt_strs+1326) +static int const aInteractiveCantList[] = { INDEX_OPT_COMMAND, INDEX_OPT_LISTPEERS, INDEX_OPT_PEERS, INDEX_OPT_SHOWPEERS, NO_EQUIVALENT }; -#define INTERACTIVE_FLAGS (OPTST_DISABLED) +#define INTERACTIVE_FLAGS (OPTST_DISABLED) /* - * Listpeers option description with + * listpeers option description with * "Must also have options" and "Incompatible options": */ -static char const zListpeersText[] = - "Print a list of the peers"; -static char const zListpeers_NAME[] = "LISTPEERS"; -static char const zListpeers_Name[] = "listpeers"; -static const int - aListpeersCantList[] = { +#define LISTPEERS_DESC (ntpdc_opt_strs+1338) +#define LISTPEERS_NAME (ntpdc_opt_strs+1364) +#define LISTPEERS_name (ntpdc_opt_strs+1374) +static int const aListpeersCantList[] = { INDEX_OPT_COMMAND, NO_EQUIVALENT }; -#define LISTPEERS_FLAGS (OPTST_DISABLED) +#define LISTPEERS_FLAGS (OPTST_DISABLED) /* - * Numeric option description: + * numeric option description: */ -static char const zNumericText[] = - "numeric host addresses"; -static char const zNumeric_NAME[] = "NUMERIC"; -static char const zNumeric_Name[] = "numeric"; -#define NUMERIC_FLAGS (OPTST_DISABLED) +#define NUMERIC_DESC (ntpdc_opt_strs+1384) +#define NUMERIC_NAME (ntpdc_opt_strs+1407) +#define NUMERIC_name (ntpdc_opt_strs+1415) +#define NUMERIC_FLAGS (OPTST_DISABLED) /* - * Peers option description with + * peers option description with * "Must also have options" and "Incompatible options": */ -static char const zPeersText[] = - "Print a list of the peers"; -static char const zPeers_NAME[] = "PEERS"; -static char const zPeers_Name[] = "peers"; -static const int - aPeersCantList[] = { +#define PEERS_DESC (ntpdc_opt_strs+1338) +#define PEERS_NAME (ntpdc_opt_strs+1423) +#define PEERS_name (ntpdc_opt_strs+1429) +static int const aPeersCantList[] = { INDEX_OPT_COMMAND, NO_EQUIVALENT }; -#define PEERS_FLAGS (OPTST_DISABLED) +#define PEERS_FLAGS (OPTST_DISABLED) /* - * Showpeers option description with + * showpeers option description with * "Must also have options" and "Incompatible options": */ -static char const zShowpeersText[] = - "Show a list of the peers"; -static char const zShowpeers_NAME[] = "SHOWPEERS"; -static char const zShowpeers_Name[] = "showpeers"; -static const int - aShowpeersCantList[] = { +#define SHOWPEERS_DESC (ntpdc_opt_strs+1435) +#define SHOWPEERS_NAME (ntpdc_opt_strs+1460) +#define SHOWPEERS_name (ntpdc_opt_strs+1470) +static int const aShowpeersCantList[] = { INDEX_OPT_COMMAND, NO_EQUIVALENT }; -#define SHOWPEERS_FLAGS (OPTST_DISABLED) +#define SHOWPEERS_FLAGS (OPTST_DISABLED) /* * 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 (ntpdc_opt_strs+1480) +#define HELP_name (ntpdc_opt_strs+1524) #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 (ntpdc_opt_strs+1529) +#define MORE_HELP_name (ntpdc_opt_strs+1574) +#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 (ntpdc_opt_strs+1584) +#define VER_name (ntpdc_opt_strs+1620) +#define SAVE_OPTS_DESC (ntpdc_opt_strs+1628) +#define SAVE_OPTS_name (ntpdc_opt_strs+1667) +#define LOAD_OPTS_DESC (ntpdc_opt_strs+1677) +#define LOAD_OPTS_NAME (ntpdc_opt_strs+1709) +#define NO_LOAD_OPTS_name (ntpdc_opt_strs+1719) +#define LOAD_OPTS_pfx (ntpdc_opt_strs+1732) +#define LOAD_OPTS_name (NO_LOAD_OPTS_name + 3) /* * Declare option callback procedures */ @@ -260,7 +296,7 @@ extern tOptProc optionBooleanVal, optionNestedVal, optionNumericVal, optionPagedUsage, optionPrintVersion, optionResetOpt, optionStackArg, optionTimeDate, optionTimeVal, - optionUnstackArg, optionVersionStderr; + optionUnstackArg, optionVendorOption, optionVersionStderr; static tOptProc doOptSet_Debug_Level, doUsageOpt; @@ -272,9 +308,9 @@ static tOptProc #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level #endif /* defined(TEST_NTPDC_OPTS) */ #ifdef TEST_NTPDC_OPTS -# define DOVERPROC optionVersionStderr +# define VER_PROC optionVersionStderr #else -# define DOVERPROC optionPrintVersion +# define VER_PROC optionPrintVersion #endif /* TEST_NTPDC_OPTS */ /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -287,11 +323,11 @@ 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 }, /* --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, @@ -299,11 +335,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_COMMAND, @@ -311,11 +347,11 @@ 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 }, /* --command */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ optionStackArg, - /* desc, NAME, name */ zCommandText, zCommand_NAME, zCommand_Name, + /* desc, NAME, name */ COMMAND_DESC, COMMAND_NAME, COMMAND_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 3, VALUE_OPT_DEBUG_LEVEL, @@ -323,11 +359,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 */ 4, VALUE_OPT_SET_DEBUG_LEVEL, @@ -335,11 +371,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 */ 5, VALUE_OPT_INTERACTIVE, @@ -347,11 +383,11 @@ 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 }, /* --interactive */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aInteractiveCantList, /* option proc */ NULL, - /* desc, NAME, name */ zInteractiveText, zInteractive_NAME, zInteractive_Name, + /* desc, NAME, name */ INTERACTIVE_DESC, INTERACTIVE_NAME, INTERACTIVE_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 6, VALUE_OPT_LISTPEERS, @@ -359,11 +395,11 @@ 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 }, /* --listpeers */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aListpeersCantList, /* option proc */ NULL, - /* desc, NAME, name */ zListpeersText, zListpeers_NAME, zListpeers_Name, + /* desc, NAME, name */ LISTPEERS_DESC, LISTPEERS_NAME, LISTPEERS_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 7, VALUE_OPT_NUMERIC, @@ -371,11 +407,11 @@ 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 }, /* --numeric */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, NULL, /* option proc */ NULL, - /* desc, NAME, name */ zNumericText, zNumeric_NAME, zNumeric_Name, + /* desc, NAME, name */ NUMERIC_DESC, NUMERIC_NAME, NUMERIC_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 8, VALUE_OPT_PEERS, @@ -383,11 +419,11 @@ 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 }, /* --peers */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aPeersCantList, /* option proc */ NULL, - /* desc, NAME, name */ zPeersText, zPeers_NAME, zPeers_Name, + /* desc, NAME, name */ PEERS_DESC, PEERS_NAME, PEERS_name, /* disablement strs */ NULL, NULL }, { /* entry idx, value */ 9, VALUE_OPT_SHOWPEERS, @@ -395,29 +431,29 @@ 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 }, /* --showpeers */ /* arg list/cookie */ NULL, /* must/cannot opts */ NULL, aShowpeersCantList, /* option proc */ NULL, - /* desc, NAME, name */ zShowpeersText, zShowpeers_NAME, zShowpeers_Name, + /* desc, NAME, name */ SHOWPEERS_DESC, SHOWPEERS_NAME, SHOWPEERS_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, @@ -425,23 +461,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) @@ -450,11 +486,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) @@ -463,29 +499,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 Ntpdc Option Environment */ -static char const zPROGNAME[6] = "NTPDC"; -static char const zUsageTitle[132] = -"ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p251\n\ -USAGE: %s [ - [] | --[{=| }] ]... [ host ...]\n"; -static char const zRcName[7] = ".ntprc"; +#define zPROGNAME (ntpdc_opt_strs+1735) +#define zUsageTitle (ntpdc_opt_strs+1741) +#define zRcName (ntpdc_opt_strs+1873) static char const * const apzHomeList[3] = { - "$HOME", - ".", + ntpdc_opt_strs+1880, + ntpdc_opt_strs+1886, NULL }; - -static char const zBugsAddr[34] = "http://bugs.ntp.org, bugs@ntp.org"; -static char const zExplain[] = "\n\n"; -#define zDetail NULL -static char const zFullVersion[] = NTPDC_FULL_VERSION; -/* extracted from optcode.tlib near line 515 */ +#define zBugsAddr (ntpdc_opt_strs+1888) +#define zExplain (ntpdc_opt_strs+1922) +#define zDetail (NULL) +#define zFullVersion (ntpdc_opt_strs+1925) +/* extracted from optcode.tlib near line 315 */ #if defined(ENABLE_NLS) # define OPTPROC_BASE OPTPROC_TRANSLATE @@ -496,8 +530,53 @@ static char const zFullVersion[] = NTPDC_FULL_VERSION; #endif /* ENABLE_NLS */ -#define ntpdc_full_usage NULL -#define ntpdc_short_usage NULL +#define ntpdc_full_usage (NULL) + +#define ntpdc_short_usage (NULL) + +/* + * Create the static procedure(s) declared above. + */ +static void +doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc) +{ + (void)pOptions; + USAGE(NTPDC_EXIT_SUCCESS); +} + +#if ! defined(TEST_NTPDC_OPTS) + +/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * + * + * For the set-debug-level option. + */ +static void +doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc) +{ + /* extracted from debug-opt.def, line 26 */ +DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); +} +#endif /* defined(TEST_NTPDC_OPTS) */ +/* extracted from optmain.tlib near line 128 */ + +#if defined(TEST_NTPDC_OPTS) /* TEST MAIN PROCEDURE: */ + +extern void optionPutShell(tOptions*); + +int +main(int argc, char ** argv) +{ + int res = NTPDC_EXIT_SUCCESS; + (void)optionProcess(&ntpdcOptions, argc, argv); + optionPutShell(&ntpdcOptions); + res = ferror(stdout); + if (res != 0) + fputs("output error writing to stdout\n", stderr); + return res; +} +#endif /* defined TEST_NTPDC_OPTS */ +/* extracted from optmain.tlib near line 1148 */ + #ifndef PKGDATADIR # define PKGDATADIR "" #endif @@ -551,49 +630,6 @@ tOptions ntpdcOptions = { PKGDATADIR, ntpdc_packager_info }; -/* - * Create the static procedure(s) declared above. - */ -static void -doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc) -{ - (void)pOptions; - USAGE(NTPDC_EXIT_SUCCESS); -} - -#if ! defined(TEST_NTPDC_OPTS) - -/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * - * - * For the set-debug-level option. - */ -static void -doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc) -{ - /* extracted from debug-opt.def, line 26 */ -DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg ); -} -#endif /* defined(TEST_NTPDC_OPTS) */ -/* extracted from optmain.tlib near line 128 */ - -#if defined(TEST_NTPDC_OPTS) /* TEST MAIN PROCEDURE: */ - -extern void optionPutShell(tOptions*); - -int -main(int argc, char ** argv) -{ - int res = NTPDC_EXIT_SUCCESS; - (void)optionProcess(&ntpdcOptions, argc, argv); - optionPutShell(&ntpdcOptions); - res = ferror(stdout); - if (res != 0) - fputs("output error writing to stdout\n", stderr); - return res; -} -#endif /* defined TEST_NTPDC_OPTS */ -/* extracted from optcode.tlib near line 666 */ - #if ENABLE_NLS #include #include diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 099a318e17..37ce1cb617 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,11 +1,11 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed January 17, 2012 at 11:33:29 AM by AutoGen 5.12 + * It has been AutoGen-ed January 25, 2012 at 12:04:02 PM by AutoGen 5.14 * From the definitions ntpdc-opts.def * and the template file options * - * Generated from AutoOpts 35:0:10 templates. + * Generated from AutoOpts 36:1: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,7 +15,8 @@ * 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 ntpdc program is copyrighted and licensed + * under the following terms: * * Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved. * This is free software. It is licensed for use, modification and @@ -23,8 +24,8 @@ * can be seen at: * * - * -PFX>Permission to use, copy, modify, and distribute this software and its + * + * 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 @@ -52,7 +53,7 @@ PFX>Permission to use, copy, modify, and distribute this software and its * tolerable version is at least as old as what was current when the header * template was released. */ -#define AO_TEMPLATE_VERSION 143360 +#define AO_TEMPLATE_VERSION 147457 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \ || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION) # error option template version mismatches autoopts/options.h header @@ -81,8 +82,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.7p251" -#define NTPDC_FULL_VERSION "ntpdc 4.2.7p251" +#define NTPDC_VERSION "4.2.7p252" +#define NTPDC_FULL_VERSION "ntpdc 4.2.7p252" /* * Interface defines for all options. Replace "n" with the UPPER_CASED @@ -203,12 +204,13 @@ typedef enum { ntpdcOptions.pzCurOpt = NULL) #define START_OPT RESTART_OPT(1) #define USAGE(c) (*ntpdcOptions.pUsageProc)(&ntpdcOptions, c) -/* extracted from opthead.tlib near line 451 */ +/* extracted from opthead.tlib near line 469 */ #ifdef __cplusplus extern "C" { #endif + /* * * * * * * * Declare the ntpdc option descriptor. diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index d67c8811ad..69856fb946 100644 --- a/ntpdc/ntpdc-opts.texi +++ b/ntpdc/ntpdc-opts.texi @@ -6,7 +6,7 @@ # # EDIT THIS FILE WITH CAUTION (ntpdc-opts.texi) # -# It has been AutoGen-ed January 17, 2012 at 11:34:08 AM by AutoGen 5.12 +# It has been AutoGen-ed January 25, 2012 at 12:04:11 PM by AutoGen 5.14 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -34,13 +34,13 @@ This software is released under a specialized copyright license. @node ntpdc usage @subsection ntpdc usage help (-?) -@cindex ntpdc usage +@cindex ntpdc-usage This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p251 +ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p252 USAGE: ntpdc [ - [] | --[@{=| @}] ]... [ host ...] Flg Arg Option-Name Description -4 no ipv4 Force IPv4 DNS name resolution diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman index 726b8a6c9e..d32fd506e7 100644 --- a/ntpdc/ntpdc.1ntpdcman +++ b/ntpdc/ntpdc.1ntpdcman @@ -1,8 +1,8 @@ -.TH ntpdc 1ntpdcman "17 Jan 2012" "4.2.7p251" "User Commands" +.TH ntpdc 1ntpdcman "25 Jan 2012" "4.2.7p252" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.man) .\" -.\" It has been AutoGen-ed January 17, 2012 at 11:34:04 AM by AutoGen 5.12 +.\" It has been AutoGen-ed January 25, 2012 at 12:04:07 PM by AutoGen 5.14 .\" From the definitions ntpdc-opts.def .\" and the template file agman-cmd.tpl .\" diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc index 4ae06bfcf7..aaa7328c8b 100644 --- a/ntpdc/ntpdc.1ntpdcmdoc +++ b/ntpdc/ntpdc.1ntpdcmdoc @@ -1,9 +1,9 @@ -.Dd January 17 2012 +.Dd January 25 2012 .Dt NTPDC 1ntpdcmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" -.\" It has been AutoGen-ed January 17, 2012 at 11:34:09 AM by AutoGen 5.12 +.\" It has been AutoGen-ed January 25, 2012 at 12:04:11 PM by AutoGen 5.14 .\" From the definitions ntpdc-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html index 3e6d326d93..9a53c7b230 100644 --- a/ntpdc/ntpdc.html +++ b/ntpdc/ntpdc.html @@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server clock. Run as root, it can correct the system clock to this offset as well. It can be run as an interactive command or from a cron job. -

This document applies to version 4.2.7p251 of ntpdc. +

This document applies to version 4.2.7p252 of ntpdc.

The program implements the SNTP protocol as defined by RFC 5905, the NTPv4 IETF specification. @@ -113,10 +113,10 @@ Up: ntpdc Invocation

ntpdc usage help (-?)

-

+

This is the automatically generated usage text for ntpdc: -

ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p251
+
ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p252
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index 8c6ed41534..7e4fff211a 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "17 Jan 2012" "4.2.7p251" "User Commands"
+.TH ntpdc @NTPDC_MS@ "25 Jan 2012" "4.2.7p252" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:34:04 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:07 PM by AutoGen 5.14
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index 0e98267c46..60dde9479a 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 17 2012
+.Dd January 25 2012
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:34:09 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:11 PM by AutoGen 5.14
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index a0f280c465..3036a16529 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  January 17, 2012 at 11:34:11 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  January 25, 2012 at 12:04:12 PM by AutoGen 5.14
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 35:0:10 templates.
+ * Generated from AutoOpts 36:1: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,7 +15,8 @@
  *  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 ntpq program is copyrighted and licensed
+ * under the following terms:
  *
  *  Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved.
  *  This is free software. It is licensed for use, modification and
@@ -23,8 +24,8 @@
  *  can be seen at:
  *    
  *    
- *  
-PFX>Permission to use, copy, modify, and distribute this software and its
+ *
+ *  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
@@ -43,7 +44,6 @@ PFX>Permission to use, copy, modify, and distribute this software and its
 
 #define OPTION_CODE_COMPILE 1
 #include "ntpq-opts.h"
-
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -51,32 +51,13 @@ extern FILE * option_usage_fp;
 
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
-static char const zCopyright[333] =
-"ntpq 4.2.7p251\n\
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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";
-static char const zLicenseDescrip[700] =
-"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, David L.\n\
-Mills, and/or others not be used in advertising or publicity pertaining to\n\
-distribution of the software without specific, written prior permission.\n\
-The University of Delaware, David L. Mills, and/or others makes no\n\
-representations about the suitability this software for any purpose. It is\n\
-provided \"as is\" without express or implied warranty.\n";
+#define zCopyright      (ntpq_opt_strs+0)
+#define zLicenseDescrip (ntpq_opt_strs+333)
 
 extern tUsageProc optionUsage;
-
 /*
  *  global included definitions
- */
-#ifdef __windows
+ */#ifdef __windows
   extern int atoi(const char*);
 #else
 # include 
@@ -87,135 +68,190 @@ extern tUsageProc optionUsage;
 #endif
 
 /*
- *  Ipv4 option description with
+ *  ntpq option static const strings
+ */
+static char const ntpq_opt_strs[1912] =
+/*     0 */ "ntpq 4.2.7p252\n"
+            "Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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"
+/*   333 */ "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, David L.\n"
+            "Mills, and/or others not be used in advertising or publicity pertaining to\n"
+            "distribution of the software without specific, written prior permission.\n"
+            "The University of Delaware, David L. Mills, and/or others 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"
+/*  1033 */ "Force IPv4 DNS name resolution\0"
+/*  1064 */ "IPV4\0"
+/*  1069 */ "ipv4\0"
+/*  1074 */ "Force IPv6 DNS name resolution\0"
+/*  1105 */ "IPV6\0"
+/*  1110 */ "ipv6\0"
+/*  1115 */ "run a command and exit\0"
+/*  1138 */ "COMMAND\0"
+/*  1146 */ "command\0"
+/*  1154 */ "Increase debug verbosity level\0"
+/*  1185 */ "DEBUG_LEVEL\0"
+/*  1197 */ "debug-level\0"
+/*  1209 */ "Set the debug verbosity level\0"
+/*  1239 */ "SET_DEBUG_LEVEL\0"
+/*  1255 */ "set-debug-level\0"
+/*  1271 */ "Print a list of the peers\0"
+/*  1297 */ "PEERS\0"
+/*  1303 */ "peers\0"
+/*  1309 */ "Force ntpq to operate in interactive mode\0"
+/*  1351 */ "INTERACTIVE\0"
+/*  1363 */ "interactive\0"
+/*  1375 */ "numeric host addresses\0"
+/*  1398 */ "NUMERIC\0"
+/*  1406 */ "numeric\0"
+/*  1414 */ "Always output status line with readvar\0"
+/*  1453 */ "OLD_RV\0"
+/*  1460 */ "old-rv\0"
+/*  1467 */ "Display extended usage information and exit\0"
+/*  1511 */ "help\0"
+/*  1516 */ "Extended usage information passed thru pager\0"
+/*  1561 */ "more-help\0"
+/*  1571 */ "Output version information and exit\0"
+/*  1607 */ "version\0"
+/*  1615 */ "Save the option state to a config file\0"
+/*  1654 */ "save-opts\0"
+/*  1664 */ "Load options from a config file\0"
+/*  1696 */ "LOAD_OPTS\0"
+/*  1706 */ "no-load-opts\0"
+/*  1719 */ "no\0"
+/*  1722 */ "NTPQ\0"
+/*  1727 */ "ntpq - standard NTP query program - Ver. 4.2.7p252\n"
+            "USAGE:  %s [ - [] | --[{=| }] ]... [ host ...]\n\0"
+/*  1848 */ ".ntprc\0"
+/*  1855 */ "$HOME\0"
+/*  1861 */ ".\0"
+/*  1863 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1897 */ "ntpq 4.2.7p252";
+
+/*
+ *  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      (ntpq_opt_strs+1033)
+#define IPV4_NAME      (ntpq_opt_strs+1064)
+#define IPV4_name      (ntpq_opt_strs+1069)
+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      (ntpq_opt_strs+1074)
+#define IPV6_NAME      (ntpq_opt_strs+1105)
+#define IPV6_name      (ntpq_opt_strs+1110)
+static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
-#define IPV6_FLAGS       (OPTST_DISABLED)
+#define IPV6_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Command option description:
+ *  command option description:
  */
-static char const zCommandText[] =
-        "run a command and exit";
-static char const zCommand_NAME[]            = "COMMAND";
-static char const zCommand_Name[]            = "command";
-#define COMMAND_FLAGS       (OPTST_DISABLED \
+#define COMMAND_DESC      (ntpq_opt_strs+1115)
+#define COMMAND_NAME      (ntpq_opt_strs+1138)
+#define COMMAND_name      (ntpq_opt_strs+1146)
+#define COMMAND_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
- *  Debug_Level option description:
+ *  debug-level option description:
  */
-static char const zDebug_LevelText[] =
-        "Increase debug verbosity level";
-static char const zDebug_Level_NAME[]        = "DEBUG_LEVEL";
-static char const zDebug_Level_Name[]        = "debug-level";
-#define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
+#define DEBUG_LEVEL_DESC      (ntpq_opt_strs+1154)
+#define DEBUG_LEVEL_NAME      (ntpq_opt_strs+1185)
+#define DEBUG_LEVEL_name      (ntpq_opt_strs+1197)
+#define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Set_Debug_Level option description:
+ *  set-debug-level option description:
  */
-static char const zSet_Debug_LevelText[] =
-        "Set the debug verbosity 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      (ntpq_opt_strs+1209)
+#define SET_DEBUG_LEVEL_NAME      (ntpq_opt_strs+1239)
+#define SET_DEBUG_LEVEL_name      (ntpq_opt_strs+1255)
+#define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
- *  Peers option description with
+ *  peers option description with
  *  "Must also have options" and "Incompatible options":
  */
-static char const zPeersText[] =
-        "Print a list of the peers";
-static char const zPeers_NAME[]              = "PEERS";
-static char const zPeers_Name[]              = "peers";
-static const int
-    aPeersCantList[] = {
+#define PEERS_DESC      (ntpq_opt_strs+1271)
+#define PEERS_NAME      (ntpq_opt_strs+1297)
+#define PEERS_name      (ntpq_opt_strs+1303)
+static int const aPeersCantList[] = {
     INDEX_OPT_INTERACTIVE, NO_EQUIVALENT };
-#define PEERS_FLAGS       (OPTST_DISABLED)
+#define PEERS_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Interactive option description with
+ *  interactive option description with
  *  "Must also have options" and "Incompatible options":
  */
-static char const zInteractiveText[] =
-        "Force ntpq to operate in interactive mode";
-static char const zInteractive_NAME[]        = "INTERACTIVE";
-static char const zInteractive_Name[]        = "interactive";
-static const int
-    aInteractiveCantList[] = {
+#define INTERACTIVE_DESC      (ntpq_opt_strs+1309)
+#define INTERACTIVE_NAME      (ntpq_opt_strs+1351)
+#define INTERACTIVE_name      (ntpq_opt_strs+1363)
+static int const aInteractiveCantList[] = {
     INDEX_OPT_COMMAND,
     INDEX_OPT_PEERS, NO_EQUIVALENT };
-#define INTERACTIVE_FLAGS       (OPTST_DISABLED)
+#define INTERACTIVE_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Numeric option description:
+ *  numeric option description:
  */
-static char const zNumericText[] =
-        "numeric host addresses";
-static char const zNumeric_NAME[]            = "NUMERIC";
-static char const zNumeric_Name[]            = "numeric";
-#define NUMERIC_FLAGS       (OPTST_DISABLED)
+#define NUMERIC_DESC      (ntpq_opt_strs+1375)
+#define NUMERIC_NAME      (ntpq_opt_strs+1398)
+#define NUMERIC_name      (ntpq_opt_strs+1406)
+#define NUMERIC_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Old_Rv option description:
+ *  old-rv option description:
  */
-static char const zOld_RvText[] =
-        "Always output status line with readvar";
-static char const zOld_Rv_NAME[]             = "OLD_RV";
-static char const zOld_Rv_Name[]             = "old-rv";
-#define OLD_RV_FLAGS       (OPTST_DISABLED)
+#define OLD_RV_DESC      (ntpq_opt_strs+1414)
+#define OLD_RV_NAME      (ntpq_opt_strs+1453)
+#define OLD_RV_name      (ntpq_opt_strs+1460)
+#define OLD_RV_FLAGS     (OPTST_DISABLED)
 
 /*
  *  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       (ntpq_opt_strs+1467)
+#define HELP_name       (ntpq_opt_strs+1511)
 #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  (ntpq_opt_strs+1516)
+#define MORE_HELP_name  (ntpq_opt_strs+1561)
+#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        (ntpq_opt_strs+1571)
+#define VER_name        (ntpq_opt_strs+1607)
+#define SAVE_OPTS_DESC  (ntpq_opt_strs+1615)
+#define SAVE_OPTS_name  (ntpq_opt_strs+1654)
+#define LOAD_OPTS_DESC     (ntpq_opt_strs+1664)
+#define LOAD_OPTS_NAME     (ntpq_opt_strs+1696)
+#define NO_LOAD_OPTS_name  (ntpq_opt_strs+1706)
+#define LOAD_OPTS_pfx      (ntpq_opt_strs+1719)
+#define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /*
  *  Declare option callback procedures
  */
@@ -245,7 +281,8 @@ extern tOptProc
     ntpq_custom_opt_handler, optionBooleanVal,        optionNestedVal,
     optionNumericVal,        optionPagedUsage,        optionPrintVersion,
     optionResetOpt,          optionStackArg,          optionTimeDate,
-    optionTimeVal,           optionUnstackArg,        optionVersionStderr;
+    optionTimeVal,           optionUnstackArg,        optionVendorOption,
+    optionVersionStderr;
 static tOptProc
     doOptSet_Debug_Level, doUsageOpt;
 
@@ -261,9 +298,9 @@ static tOptProc
 #define PEERS_OPT_PROC ntpq_custom_opt_handler
 #endif /* defined(TEST_NTPQ_OPTS) */
 #ifdef TEST_NTPQ_OPTS
-# define DOVERPROC optionVersionStderr
+# define VER_PROC       optionVersionStderr
 #else
-# define DOVERPROC optionPrintVersion
+# define VER_PROC       optionPrintVersion
 #endif /* TEST_NTPQ_OPTS */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -276,11 +313,11 @@ 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 }, /* --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,
@@ -288,11 +325,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_COMMAND,
@@ -300,11 +337,11 @@ 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 }, /* --command */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ COMMAND_OPT_PROC,
-     /* desc, NAME, name */ zCommandText, zCommand_NAME, zCommand_Name,
+     /* desc, NAME, name */ COMMAND_DESC, COMMAND_NAME, COMMAND_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 3, VALUE_OPT_DEBUG_LEVEL,
@@ -312,11 +349,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 */ 4, VALUE_OPT_SET_DEBUG_LEVEL,
@@ -324,11 +361,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 */ 5, VALUE_OPT_PEERS,
@@ -336,11 +373,11 @@ 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 }, /* --peers */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, aPeersCantList,
      /* option proc      */ PEERS_OPT_PROC,
-     /* desc, NAME, name */ zPeersText, zPeers_NAME, zPeers_Name,
+     /* desc, NAME, name */ PEERS_DESC, PEERS_NAME, PEERS_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 6, VALUE_OPT_INTERACTIVE,
@@ -348,11 +385,11 @@ 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 }, /* --interactive */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, aInteractiveCantList,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zInteractiveText, zInteractive_NAME, zInteractive_Name,
+     /* desc, NAME, name */ INTERACTIVE_DESC, INTERACTIVE_NAME, INTERACTIVE_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 7, VALUE_OPT_NUMERIC,
@@ -360,11 +397,11 @@ 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 }, /* --numeric */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zNumericText, zNumeric_NAME, zNumeric_Name,
+     /* desc, NAME, name */ NUMERIC_DESC, NUMERIC_NAME, NUMERIC_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 8, VALUE_OPT_OLD_RV,
@@ -372,29 +409,29 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ OLD_RV_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --old-rv */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zOld_RvText, zOld_Rv_NAME, zOld_Rv_Name,
+     /* desc, NAME, name */ OLD_RV_DESC, OLD_RV_NAME, OLD_RV_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,
@@ -402,23 +439,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)
@@ -427,11 +464,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)
@@ -440,29 +477,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 Ntpq Option Environment
  */
-static char const zPROGNAME[5] = "NTPQ";
-static char const zUsageTitle[121] =
-"ntpq - standard NTP query program - Ver. 4.2.7p251\n\
-USAGE:  %s [ - [] | --[{=| }] ]... [ host ...]\n";
-static char const zRcName[7] = ".ntprc";
+#define zPROGNAME       (ntpq_opt_strs+1722)
+#define zUsageTitle     (ntpq_opt_strs+1727)
+#define zRcName         (ntpq_opt_strs+1848)
 static char const * const apzHomeList[3] = {
-    "$HOME",
-    ".",
+    ntpq_opt_strs+1855,
+    ntpq_opt_strs+1861,
     NULL };
-
-static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
-#define zExplain NULL
-#define zDetail         NULL
-static char const zFullVersion[] = NTPQ_FULL_VERSION;
-/* extracted from optcode.tlib near line 515 */
+#define zBugsAddr       (ntpq_opt_strs+1863)
+#define zExplain        (NULL)
+#define zDetail         (NULL)
+#define zFullVersion    (ntpq_opt_strs+1897)
+/* extracted from optcode.tlib near line 315 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -473,8 +508,53 @@ static char const zFullVersion[] = NTPQ_FULL_VERSION;
 #endif /* ENABLE_NLS */
 
 
-#define ntpq_full_usage NULL
-#define ntpq_short_usage NULL
+#define ntpq_full_usage (NULL)
+
+#define ntpq_short_usage (NULL)
+
+/*
+ *  Create the static procedure(s) declared above.
+ */
+static void
+doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
+{
+    (void)pOptions;
+    USAGE(NTPQ_EXIT_SUCCESS);
+}
+
+#if ! defined(TEST_NTPQ_OPTS)
+
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ *   For the set-debug-level option.
+ */
+static void
+doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
+{
+    /* extracted from debug-opt.def, line 26 */
+DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
+}
+#endif /* defined(TEST_NTPQ_OPTS) */
+/* extracted from optmain.tlib near line 128 */
+
+#if defined(TEST_NTPQ_OPTS) /* TEST MAIN PROCEDURE: */
+
+extern void optionPutShell(tOptions*);
+
+int
+main(int argc, char ** argv)
+{
+    int res = NTPQ_EXIT_SUCCESS;
+    (void)optionProcess(&ntpqOptions, argc, argv);
+    optionPutShell(&ntpqOptions);
+    res = ferror(stdout);
+    if (res != 0)
+        fputs("output error writing to stdout\n", stderr);
+    return res;
+}
+#endif  /* defined TEST_NTPQ_OPTS */
+/* extracted from optmain.tlib near line 1148 */
+
 #ifndef  PKGDATADIR
 # define PKGDATADIR ""
 #endif
@@ -528,49 +608,6 @@ tOptions ntpqOptions = {
     PKGDATADIR, ntpq_packager_info
 };
 
-/*
- *  Create the static procedure(s) declared above.
- */
-static void
-doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
-{
-    (void)pOptions;
-    USAGE(NTPQ_EXIT_SUCCESS);
-}
-
-#if ! defined(TEST_NTPQ_OPTS)
-
-/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
- *
- *   For the set-debug-level option.
- */
-static void
-doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
-{
-    /* extracted from debug-opt.def, line 26 */
-DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
-}
-#endif /* defined(TEST_NTPQ_OPTS) */
-/* extracted from optmain.tlib near line 128 */
-
-#if defined(TEST_NTPQ_OPTS) /* TEST MAIN PROCEDURE: */
-
-extern void optionPutShell(tOptions*);
-
-int
-main(int argc, char ** argv)
-{
-    int res = NTPQ_EXIT_SUCCESS;
-    (void)optionProcess(&ntpqOptions, argc, argv);
-    optionPutShell(&ntpqOptions);
-    res = ferror(stdout);
-    if (res != 0)
-        fputs("output error writing to stdout\n", stderr);
-    return res;
-}
-#endif  /* defined TEST_NTPQ_OPTS */
-/* extracted from optcode.tlib near line 666 */
-
 #if ENABLE_NLS
 #include 
 #include 
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 42b3245a84..8019bb4bae 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  January 17, 2012 at 11:34:10 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  January 25, 2012 at 12:04:12 PM by AutoGen 5.14
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 35:0:10 templates.
+ * Generated from AutoOpts 36:1: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,7 +15,8 @@
  *  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 ntpq program is copyrighted and licensed
+ * under the following terms:
  *
  *  Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved.
  *  This is free software. It is licensed for use, modification and
@@ -23,8 +24,8 @@
  *  can be seen at:
  *    
  *    
- *  
-PFX>Permission to use, copy, modify, and distribute this software and its
+ *
+ *  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
@@ -52,7 +53,7 @@ PFX>Permission to use, copy, modify, and distribute this software and its
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 143360
+#define AO_TEMPLATE_VERSION 147457
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -80,8 +81,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p251"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p251"
+#define NTPQ_VERSION       "4.2.7p252"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p252"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -196,12 +197,13 @@ typedef enum {
                 ntpqOptions.pzCurOpt  = NULL)
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpqOptions.pUsageProc)(&ntpqOptions, c)
-/* extracted from opthead.tlib near line 451 */
+/* extracted from opthead.tlib near line 469 */
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
+
 /* * * * * *
  *
  *  Declare the ntpq option descriptor.
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 4dfa3d66f5..32338d554c 100644
--- a/ntpq/ntpq-opts.texi
+++ b/ntpq/ntpq-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  January 17, 2012 at 11:34:24 AM by AutoGen 5.12
+# It has been AutoGen-ed  January 25, 2012 at 12:04:36 PM by AutoGen 5.14
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -34,13 +34,13 @@ This software is released under a specialized copyright license.
 
 @node ntpq usage
 @subsection ntpq usage help (-?)
-@cindex ntpq usage
+@cindex ntpq-usage
 
 This is the automatically generated usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p251
+ntpq - standard NTP query program - Ver. 4.2.7p252
 USAGE:  ntpq [ - [] | --[@{=| @}] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 9cdabbbfdd..24f4d94c65 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "17 Jan 2012" "4.2.7p251" "User Commands"
+.TH ntpq 1ntpqman "25 Jan 2012" "4.2.7p252" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:34:21 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:33 PM by AutoGen 5.14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index b7490ba5b0..b7c1a6210d 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd January 17 2012
+.Dd January 25 2012
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:34:24 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:36 PM by AutoGen 5.14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index 435b27c119..8e10054554 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "17 Jan 2012" "4.2.7p251" "User Commands"
+.TH ntpq @NTPQ_MS@ "25 Jan 2012" "4.2.7p252" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:34:21 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:33 PM by AutoGen 5.14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 05af6fb7b0..0a2acda87c 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 17 2012
+.Dd January 25 2012
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:34:24 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:36 PM by AutoGen 5.14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index b2fd22a5ce..271034c7b8 100644
--- a/ntpsnmpd/ntpsnmpd-opts.c
+++ b/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  January 17, 2012 at 11:34:28 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  January 25, 2012 at 12:04:37 PM by AutoGen 5.14
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 35:0:10 templates.
+ * Generated from AutoOpts 36:1: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,7 +15,8 @@
  *  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 ntpsnmpd program is copyrighted and licensed
+ * under the following terms:
  *
  *  Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved.
  *  This is free software. It is licensed for use, modification and
@@ -23,8 +24,8 @@
  *  can be seen at:
  *    
  *    
- *  
-PFX>Permission to use, copy, modify, and distribute this software and its
+ *
+ *  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
@@ -43,7 +44,6 @@ PFX>Permission to use, copy, modify, and distribute this software and its
 
 #define OPTION_CODE_COMPILE 1
 #include "ntpsnmpd-opts.h"
-
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -51,25 +51,8 @@ extern FILE * option_usage_fp;
 
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
-static char const zCopyright[337] =
-"ntpsnmpd 4.2.7p251\n\
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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";
-static char const zLicenseDescrip[700] =
-"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, David L.\n\
-Mills, and/or others not be used in advertising or publicity pertaining to\n\
-distribution of the software without specific, written prior permission.\n\
-The University of Delaware, David L. Mills, and/or others makes no\n\
-representations about the suitability this software for any purpose. It is\n\
-provided \"as is\" without express or implied warranty.\n";
+#define zCopyright      (ntpsnmpd_opt_strs+0)
+#define zLicenseDescrip (ntpsnmpd_opt_strs+337)
 
 extern tUsageProc optionUsage;
 
@@ -78,64 +61,113 @@ extern tUsageProc optionUsage;
 #endif
 
 /*
- *  Nofork option description:
+ *  ntpsnmpd option static const strings
  */
-static char const zNoforkText[] =
-        "Do not fork";
-static char const zNofork_NAME[]             = "NOFORK";
-static char const zNofork_Name[]             = "nofork";
-#define NOFORK_FLAGS       (OPTST_DISABLED)
+static char const ntpsnmpd_opt_strs[1640] =
+/*     0 */ "ntpsnmpd 4.2.7p252\n"
+            "Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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"
+/*   337 */ "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, David L.\n"
+            "Mills, and/or others not be used in advertising or publicity pertaining to\n"
+            "distribution of the software without specific, written prior permission.\n"
+            "The University of Delaware, David L. Mills, and/or others 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"
+/*  1037 */ "Do not fork\0"
+/*  1049 */ "NOFORK\0"
+/*  1056 */ "nofork\0"
+/*  1063 */ "Log to syslog()\0"
+/*  1079 */ "SYSLOG\0"
+/*  1086 */ "syslog\0"
+/*  1093 */ "The socket address ntpsnmpd uses to connect to net-snmpd\0"
+/*  1150 */ "AGENTXSOCKET\0"
+/*  1163 */ "agentxsocket\0"
+/*  1176 */ "unix:/var/agentx/master\0"
+/*  1200 */ "Display extended usage information and exit\0"
+/*  1244 */ "help\0"
+/*  1249 */ "Extended usage information passed thru pager\0"
+/*  1294 */ "more-help\0"
+/*  1304 */ "Output version information and exit\0"
+/*  1340 */ "version\0"
+/*  1348 */ "Save the option state to a config file\0"
+/*  1387 */ "save-opts\0"
+/*  1397 */ "Load options from a config file\0"
+/*  1429 */ "LOAD_OPTS\0"
+/*  1439 */ "no-load-opts\0"
+/*  1452 */ "no\0"
+/*  1455 */ "NTPSNMPD\0"
+/*  1464 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p252\n"
+            "USAGE:  %s [ - [] | --[{=| }] ]...\n\0"
+/*  1569 */ ".ntprc\0"
+/*  1576 */ "$HOME\0"
+/*  1582 */ ".\0"
+/*  1584 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1618 */ "\n\n\0"
+/*  1621 */ "ntpsnmpd 4.2.7p252";
 
 /*
- *  Syslog option description:
+ *  nofork option description:
  */
-static char const zSyslogText[] =
-        "Log to syslog()";
-static char const zSyslog_NAME[]             = "SYSLOG";
-static char const zSyslog_Name[]             = "syslog";
-#define SYSLOG_FLAGS       (OPTST_DISABLED)
+#define NOFORK_DESC      (ntpsnmpd_opt_strs+1037)
+#define NOFORK_NAME      (ntpsnmpd_opt_strs+1049)
+#define NOFORK_name      (ntpsnmpd_opt_strs+1056)
+#define NOFORK_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Agentxsocket option description:
+ *  syslog option description:
  */
-static char const zAgentxsocketText[] =
-        "The socket address ntpsnmpd uses to connect to net-snmpd";
-static char const zAgentxsocket_NAME[]       = "AGENTXSOCKET";
-static char const zAgentxsocket_Name[]       = "agentxsocket";
-static char const zAgentxsocketDefaultArg[]    = "unix:/var/agentx/master";
-#define AGENTXSOCKET_FLAGS       (OPTST_DISABLED \
+#define SYSLOG_DESC      (ntpsnmpd_opt_strs+1063)
+#define SYSLOG_NAME      (ntpsnmpd_opt_strs+1079)
+#define SYSLOG_name      (ntpsnmpd_opt_strs+1086)
+#define SYSLOG_FLAGS     (OPTST_DISABLED)
+
+/*
+ *  agentXSocket option description:
+ */
+#define AGENTXSOCKET_DESC      (ntpsnmpd_opt_strs+1093)
+#define AGENTXSOCKET_NAME      (ntpsnmpd_opt_strs+1150)
+#define AGENTXSOCKET_name      (ntpsnmpd_opt_strs+1163)
+#define AGENTXSOCKET_DFT_ARG   (ntpsnmpd_opt_strs+1176)
+#define AGENTXSOCKET_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  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       (ntpsnmpd_opt_strs+1200)
+#define HELP_name       (ntpsnmpd_opt_strs+1244)
 #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  (ntpsnmpd_opt_strs+1249)
+#define MORE_HELP_name  (ntpsnmpd_opt_strs+1294)
+#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        (ntpsnmpd_opt_strs+1304)
+#define VER_name        (ntpsnmpd_opt_strs+1340)
+#define SAVE_OPTS_DESC  (ntpsnmpd_opt_strs+1348)
+#define SAVE_OPTS_name  (ntpsnmpd_opt_strs+1387)
+#define LOAD_OPTS_DESC     (ntpsnmpd_opt_strs+1397)
+#define LOAD_OPTS_NAME     (ntpsnmpd_opt_strs+1429)
+#define NO_LOAD_OPTS_name  (ntpsnmpd_opt_strs+1439)
+#define LOAD_OPTS_pfx      (ntpsnmpd_opt_strs+1452)
+#define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /*
  *  Declare option callback procedures
  */
@@ -155,14 +187,14 @@ extern tOptProc
     optionBooleanVal,    optionNestedVal,     optionNumericVal,
     optionPagedUsage,    optionPrintVersion,  optionResetOpt,
     optionStackArg,      optionTimeDate,      optionTimeVal,
-    optionUnstackArg,    optionVersionStderr;
+    optionUnstackArg,    optionVendorOption,  optionVersionStderr;
 static tOptProc
     doUsageOpt;
 #endif /* defined(TEST_NTPSNMPD_OPTS) */
 #ifdef TEST_NTPSNMPD_OPTS
-# define DOVERPROC optionVersionStderr
+# define VER_PROC       optionVersionStderr
 #else
-# define DOVERPROC optionPrintVersion
+# define VER_PROC       optionPrintVersion
 #endif /* TEST_NTPSNMPD_OPTS */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -175,11 +207,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,
      /* 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 */ 1, VALUE_OPT_SYSLOG,
@@ -187,11 +219,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ SYSLOG_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --syslog */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zSyslogText, zSyslog_NAME, zSyslog_Name,
+     /* desc, NAME, name */ SYSLOG_DESC, SYSLOG_NAME, SYSLOG_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 2, VALUE_OPT_AGENTXSOCKET,
@@ -199,29 +231,29 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ AGENTXSOCKET_FLAGS, 0,
-     /* last opt argumnt */ { zAgentxsocketDefaultArg },
+     /* last opt argumnt */ { AGENTXSOCKET_DFT_ARG },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zAgentxsocketText, zAgentxsocket_NAME, zAgentxsocket_Name,
+     /* desc, NAME, name */ AGENTXSOCKET_DESC, AGENTXSOCKET_NAME, AGENTXSOCKET_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,
@@ -229,23 +261,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)
@@ -254,11 +286,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)
@@ -267,29 +299,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 Ntpsnmpd Option Environment
  */
-static char const zPROGNAME[9] = "NTPSNMPD";
-static char const zUsageTitle[105] =
-"ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p251\n\
-USAGE:  %s [ - [] | --[{=| }] ]...\n";
-static char const zRcName[7] = ".ntprc";
+#define zPROGNAME       (ntpsnmpd_opt_strs+1455)
+#define zUsageTitle     (ntpsnmpd_opt_strs+1464)
+#define zRcName         (ntpsnmpd_opt_strs+1569)
 static char const * const apzHomeList[3] = {
-    "$HOME",
-    ".",
+    ntpsnmpd_opt_strs+1576,
+    ntpsnmpd_opt_strs+1582,
     NULL };
-
-static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
-static char const zExplain[] = "\n\n";
-#define zDetail         NULL
-static char const zFullVersion[] = NTPSNMPD_FULL_VERSION;
-/* extracted from optcode.tlib near line 515 */
+#define zBugsAddr       (ntpsnmpd_opt_strs+1584)
+#define zExplain        (ntpsnmpd_opt_strs+1618)
+#define zDetail         (NULL)
+#define zFullVersion    (ntpsnmpd_opt_strs+1621)
+/* extracted from optcode.tlib near line 315 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -300,8 +330,39 @@ static char const zFullVersion[] = NTPSNMPD_FULL_VERSION;
 #endif /* ENABLE_NLS */
 
 
-#define ntpsnmpd_full_usage NULL
-#define ntpsnmpd_short_usage NULL
+#define ntpsnmpd_full_usage (NULL)
+
+#define ntpsnmpd_short_usage (NULL)
+
+/*
+ *  Create the static procedure(s) declared above.
+ */
+static void
+doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
+{
+    (void)pOptions;
+    USAGE(NTPSNMPD_EXIT_SUCCESS);
+}
+/* extracted from optmain.tlib near line 128 */
+
+#if defined(TEST_NTPSNMPD_OPTS) /* TEST MAIN PROCEDURE: */
+
+extern void optionPutShell(tOptions*);
+
+int
+main(int argc, char ** argv)
+{
+    int res = NTPSNMPD_EXIT_SUCCESS;
+    (void)optionProcess(&ntpsnmpdOptions, argc, argv);
+    optionPutShell(&ntpsnmpdOptions);
+    res = ferror(stdout);
+    if (res != 0)
+        fputs("output error writing to stdout\n", stderr);
+    return res;
+}
+#endif  /* defined TEST_NTPSNMPD_OPTS */
+/* extracted from optmain.tlib near line 1148 */
+
 #ifndef  PKGDATADIR
 # define PKGDATADIR ""
 #endif
@@ -356,35 +417,6 @@ tOptions ntpsnmpdOptions = {
     PKGDATADIR, ntpsnmpd_packager_info
 };
 
-/*
- *  Create the static procedure(s) declared above.
- */
-static void
-doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
-{
-    (void)pOptions;
-    USAGE(NTPSNMPD_EXIT_SUCCESS);
-}
-/* extracted from optmain.tlib near line 128 */
-
-#if defined(TEST_NTPSNMPD_OPTS) /* TEST MAIN PROCEDURE: */
-
-extern void optionPutShell(tOptions*);
-
-int
-main(int argc, char ** argv)
-{
-    int res = NTPSNMPD_EXIT_SUCCESS;
-    (void)optionProcess(&ntpsnmpdOptions, argc, argv);
-    optionPutShell(&ntpsnmpdOptions);
-    res = ferror(stdout);
-    if (res != 0)
-        fputs("output error writing to stdout\n", stderr);
-    return res;
-}
-#endif  /* defined TEST_NTPSNMPD_OPTS */
-/* extracted from optcode.tlib near line 666 */
-
 #if ENABLE_NLS
 #include 
 #include 
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 66a0e455c4..5febb80209 100644
--- a/ntpsnmpd/ntpsnmpd-opts.h
+++ b/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  January 17, 2012 at 11:34:28 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  January 25, 2012 at 12:04:37 PM by AutoGen 5.14
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 35:0:10 templates.
+ * Generated from AutoOpts 36:1: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,7 +15,8 @@
  *  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 ntpsnmpd program is copyrighted and licensed
+ * under the following terms:
  *
  *  Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved.
  *  This is free software. It is licensed for use, modification and
@@ -23,8 +24,8 @@
  *  can be seen at:
  *    
  *    
- *  
-PFX>Permission to use, copy, modify, and distribute this software and its
+ *
+ *  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
@@ -52,7 +53,7 @@ PFX>Permission to use, copy, modify, and distribute this software and its
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 143360
+#define AO_TEMPLATE_VERSION 147457
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -74,8 +75,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p251"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p251"
+#define NTPSNMPD_VERSION       "4.2.7p252"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p252"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -154,12 +155,13 @@ typedef enum {
                 ntpsnmpdOptions.pzCurOpt  = NULL)
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntpsnmpdOptions.pUsageProc)(&ntpsnmpdOptions, c)
-/* extracted from opthead.tlib near line 451 */
+/* extracted from opthead.tlib near line 469 */
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
+
 /* * * * * *
  *
  *  Declare the ntpsnmpd option descriptor.
diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index 85f23c0bb6..5200577a9a 100644
--- a/ntpsnmpd/ntpsnmpd-opts.texi
+++ b/ntpsnmpd/ntpsnmpd-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.texi)
 # 
-# It has been AutoGen-ed  January 17, 2012 at 11:34:47 AM by AutoGen 5.12
+# It has been AutoGen-ed  January 25, 2012 at 12:04:45 PM by AutoGen 5.14
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -27,13 +27,13 @@ This software is released under a specialized copyright license.
 
 @node ntpsnmpd usage
 @subsection ntpsnmpd usage help (-?)
-@cindex ntpsnmpd usage
+@cindex ntpsnmpd-usage
 
 This is the automatically generated usage text for ntpsnmpd:
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p251
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p252
 USAGE:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index 860facbdd6..baa9fd6f48 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "17 Jan 2012" "4.2.7p251" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "25 Jan 2012" "4.2.7p252" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:34:45 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:43 PM by AutoGen 5.14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index ddb107dfe8..5dc2559a4b 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd January 17 2012
+.Dd January 25 2012
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:34:48 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:45 PM by AutoGen 5.14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index cd18a50ccc..4730603597 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "17 Jan 2012" "4.2.7p251" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "25 Jan 2012" "4.2.7p252" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:34:45 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:43 PM by AutoGen 5.14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index 4e81147fb5..05d1b04c74 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 17 2012
+.Dd January 25 2012
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:34:48 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:45 PM by AutoGen 5.14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/packageinfo.sh b/packageinfo.sh
index 89160a3a44..8f541f67c0 100644
--- a/packageinfo.sh
+++ b/packageinfo.sh
@@ -70,7 +70,7 @@ CLTAG=NTP_4_2_0
 # - Numeric values increment
 # - empty 'increments' to 1
 # - NEW 'increments' to empty
-point=251
+point=252
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/scripts/ntp-wait-opts.texi b/scripts/ntp-wait-opts.texi
index 778d499c51..ba5d620040 100644
--- a/scripts/ntp-wait-opts.texi
+++ b/scripts/ntp-wait-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.texi)
 # 
-# It has been AutoGen-ed  January 17, 2012 at 11:33:01 AM by AutoGen 5.12
+# It has been AutoGen-ed  January 25, 2012 at 12:01:54 PM by AutoGen 5.14
 # From the definitions    ntp-wait-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -27,7 +27,7 @@ This software is released under a specialized copyright license.
 
 @node ntp-wait usage
 @subsection ntp-wait usage help (-?)
-@cindex ntp-wait usage
+@cindex ntp-wait-usage
 
 This is the automatically generated usage text for ntp-wait:
 
diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman
index 323efb3297..e67320b20f 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "17 Jan 2012" "ntp (4.2.7p251)" "User Commands"
+.TH ntp-wait 1ntp-waitman "25 Jan 2012" "ntp (4.2.7p252)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:32:58 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:01:51 PM by AutoGen 5.14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait.1ntp-waitmdoc
index 25bd4017ba..81f21b0db0 100644
--- a/scripts/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd January 17 2012
+.Dd January 25 2012
 .Dt NTP_WAIT 1ntp-waitmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:33:02 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:01:55 PM by AutoGen 5.14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntp-wait.html b/scripts/ntp-wait.html
index 1851151911..008a0e7aac 100644
--- a/scripts/ntp-wait.html
+++ b/scripts/ntp-wait.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  
This document applies to version 4.2.7p251 of ntp-wait.
+  
This document applies to version 4.2.7p252 of ntp-wait.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -106,7 +106,7 @@ Up: ntp-wait Invo
 
 
ntp-wait usage help (-?)

 
-

+

 This is the automatically generated usage text for ntp-wait:
 
 
/deacon/backroom/snaps/ntp-dev/A.snap/scripts/ntp-wait version [unknown] calling Getopt::Std::getopts (version 1.05 [paranoid]),
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index 61de49164d..8f9ef105b0 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "17 Jan 2012" "ntp (4.2.7p251)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "25 Jan 2012" "ntp (4.2.7p252)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:32:58 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:01:51 PM by AutoGen 5.14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.mdoc.in b/scripts/ntp-wait.mdoc.in
index ae4b889ab5..6fe9d722da 100644
--- a/scripts/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 17 2012
+.Dd January 25 2012
 .Dt NTP_WAIT @NTP_WAIT_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:33:02 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:01:55 PM by AutoGen 5.14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 0f840a48ca..a4ecd5f17c 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  January 17, 2012 at 11:26:01 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  January 25, 2012 at 12:05:08 PM by AutoGen 5.14
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 35:0:10 templates.
+ * Generated from AutoOpts 36:1: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,7 +15,8 @@
  *  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 sntp program is copyrighted and licensed
+ * under the following terms:
  *
  *  Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved.
  *  This is free software. It is licensed for use, modification and
@@ -23,8 +24,8 @@
  *  can be seen at:
  *    
  *    
- *  
-PFX>Permission to use, copy, modify, and distribute this software and its
+ *
+ *  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
@@ -40,10 +41,10 @@ PFX>Permission to use, copy, modify, and distribute this software and its
 #include 
 #include 
 #include 
-#include 
+
 #define OPTION_CODE_COMPILE 1
 #include "sntp-opts.h"
-
+#include 
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -51,32 +52,13 @@ extern FILE * option_usage_fp;
 
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
-static char const zCopyright[333] =
-"sntp 4.2.7p251\n\
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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";
-static char const zLicenseDescrip[700] =
-"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, David L.\n\
-Mills, and/or others not be used in advertising or publicity pertaining to\n\
-distribution of the software without specific, written prior permission.\n\
-The University of Delaware, David L. Mills, and/or others makes no\n\
-representations about the suitability this software for any purpose. It is\n\
-provided \"as is\" without express or implied warranty.\n";
+#define zCopyright      (sntp_opt_strs+0)
+#define zLicenseDescrip (sntp_opt_strs+333)
 
 extern tUsageProc optionUsage;
-
 /*
  *  global included definitions
- */
-#ifdef __windows
+ */#ifdef __windows
   extern int atoi(const char*);
 #else
 # include 
@@ -87,233 +69,313 @@ extern tUsageProc optionUsage;
 #endif
 
 /*
- *  Ipv4 option description with
+ *  sntp option static const strings
+ */
+static char const sntp_opt_strs[2694] =
+/*     0 */ "sntp 4.2.7p252\n"
+            "Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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"
+/*   333 */ "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, David L.\n"
+            "Mills, and/or others not be used in advertising or publicity pertaining to\n"
+            "distribution of the software without specific, written prior permission.\n"
+            "The University of Delaware, David L. Mills, and/or others 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"
+/*  1033 */ "Force IPv4 DNS name resolution\0"
+/*  1064 */ "IPV4\0"
+/*  1069 */ "ipv4\0"
+/*  1074 */ "Force IPv6 DNS name resolution\0"
+/*  1105 */ "IPV6\0"
+/*  1110 */ "ipv6\0"
+/*  1115 */ "Enable authentication with the key @var{auth-keynumber}\0"
+/*  1171 */ "AUTHENTICATION\0"
+/*  1186 */ "authentication\0"
+/*  1201 */ "The number of seconds to wait for broadcasts\0"
+/*  1246 */ "BCTIMEOUT\0"
+/*  1256 */ "bctimeout\0"
+/*  1266 */ "Listen to the address specified for broadcast time sync\0"
+/*  1322 */ "BROADCAST\0"
+/*  1332 */ "broadcast\0"
+/*  1342 */ "Concurrently query all IPs returned for host-name\0"
+/*  1392 */ "CONCURRENT\0"
+/*  1403 */ "concurrent\0"
+/*  1414 */ "Increase debug verbosity level\0"
+/*  1445 */ "DEBUG_LEVEL\0"
+/*  1457 */ "debug-level\0"
+/*  1469 */ "Set the debug verbosity level\0"
+/*  1499 */ "SET_DEBUG_LEVEL\0"
+/*  1515 */ "set-debug-level\0"
+/*  1531 */ "The gap (in milliseconds) between time requests\0"
+/*  1579 */ "GAP\0"
+/*  1583 */ "gap\0"
+/*  1587 */ "KoD history filename\0"
+/*  1608 */ "KOD\0"
+/*  1612 */ "kod\0"
+/*  1616 */ "/var/db/ntp-kod\0"
+/*  1632 */ "Look in this file for the key specified with @option{-a}\0"
+/*  1689 */ "KEYFILE\0"
+/*  1697 */ "keyfile\0"
+/*  1705 */ "Log to specified logfile\0"
+/*  1730 */ "LOGFILE\0"
+/*  1738 */ "logfile\0"
+/*  1746 */ "Adjustments less than @var{steplimit} msec will be slewed\0"
+/*  1804 */ "STEPLIMIT\0"
+/*  1814 */ "steplimit\0"
+/*  1824 */ "Send @var{int} as our NTP version\0"
+/*  1858 */ "NTPVERSION\0"
+/*  1869 */ "ntpversion\0"
+/*  1880 */ "Use the NTP Reserved Port (port 123)\0"
+/*  1917 */ "USERESERVEDPORT\0"
+/*  1933 */ "usereservedport\0"
+/*  1949 */ "OK to 'step' the time with @command{settimeofday(2)}\0"
+/*  2002 */ "STEP\0"
+/*  2007 */ "step\0"
+/*  2012 */ "OK to 'slew' the time with @command{adjtime(2)}\0"
+/*  2060 */ "SLEW\0"
+/*  2065 */ "slew\0"
+/*  2070 */ "The number of seconds to wait for unicast responses\0"
+/*  2122 */ "UCTIMEOUT\0"
+/*  2132 */ "uctimeout\0"
+/*  2142 */ "Wait for pending replies (if not setting the time)\0"
+/*  2193 */ "WAIT\0"
+/*  2198 */ "no-wait\0"
+/*  2206 */ "no\0"
+/*  2209 */ "Display extended usage information and exit\0"
+/*  2253 */ "help\0"
+/*  2258 */ "Extended usage information passed thru pager\0"
+/*  2303 */ "more-help\0"
+/*  2313 */ "Output version information and exit\0"
+/*  2349 */ "version\0"
+/*  2357 */ "Save the option state to a config file\0"
+/*  2396 */ "save-opts\0"
+/*  2406 */ "Load options from a config file\0"
+/*  2438 */ "LOAD_OPTS\0"
+/*  2448 */ "no-load-opts\0"
+/*  2461 */ "SNTP\0"
+/*  2466 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p252\n"
+            "USAGE:  %s [ - [] | --[{=| }] ]... \\\n"
+            "\t\t[ hostname-or-IP ...]\n\0"
+/*  2627 */ ".ntprc\0"
+/*  2634 */ "$HOME\0"
+/*  2640 */ ".\0"
+/*  2642 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  2676 */ "\n\n\0"
+/*  2679 */ "sntp 4.2.7p252";
+
+/*
+ *  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      (sntp_opt_strs+1033)
+#define IPV4_NAME      (sntp_opt_strs+1064)
+#define IPV4_name      (sntp_opt_strs+1069)
+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      (sntp_opt_strs+1074)
+#define IPV6_NAME      (sntp_opt_strs+1105)
+#define IPV6_name      (sntp_opt_strs+1110)
+static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
-#define IPV6_FLAGS       (OPTST_DISABLED)
+#define IPV6_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Authentication option description:
+ *  authentication option description:
  */
-static char const zAuthenticationText[] =
-        "Enable authentication with the key @var{auth-keynumber}";
-static char const zAuthentication_NAME[]     = "AUTHENTICATION";
-static char const zAuthentication_Name[]     = "authentication";
-#define AUTHENTICATION_FLAGS       (OPTST_DISABLED \
+#define AUTHENTICATION_DESC      (sntp_opt_strs+1115)
+#define AUTHENTICATION_NAME      (sntp_opt_strs+1171)
+#define AUTHENTICATION_name      (sntp_opt_strs+1186)
+#define AUTHENTICATION_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
- *  Bctimeout option description:
- */
-static char const zBctimeoutText[] =
-        "The number of seconds to wait for broadcasts";
-static char const zBctimeout_NAME[]          = "BCTIMEOUT";
-static char const zBctimeout_Name[]          = "bctimeout";
-#define zBctimeoutDefaultArg         ((char const*)68)
-#define BCTIMEOUT_FLAGS       (OPTST_DISABLED \
+ *  bctimeout option description:
+ */
+#define BCTIMEOUT_DESC      (sntp_opt_strs+1201)
+#define BCTIMEOUT_NAME      (sntp_opt_strs+1246)
+#define BCTIMEOUT_name      (sntp_opt_strs+1256)
+#define BCTIMEOUT_DFT_ARG   ((char const*)68)
+#define BCTIMEOUT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
- *  Broadcast option description:
+ *  broadcast option description:
  */
-static char const zBroadcastText[] =
-        "Listen to the address specified for broadcast time sync";
-static char const zBroadcast_NAME[]          = "BROADCAST";
-static char const zBroadcast_Name[]          = "broadcast";
-#define BROADCAST_FLAGS       (OPTST_DISABLED | OPTST_STACKED \
+#define BROADCAST_DESC      (sntp_opt_strs+1266)
+#define BROADCAST_NAME      (sntp_opt_strs+1322)
+#define BROADCAST_name      (sntp_opt_strs+1332)
+#define BROADCAST_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
- *  Concurrent option description:
+ *  concurrent option description:
  */
-static char const zConcurrentText[] =
-        "Concurrently query all IPs returned for host-name";
-static char const zConcurrent_NAME[]         = "CONCURRENT";
-static char const zConcurrent_Name[]         = "concurrent";
-#define CONCURRENT_FLAGS       (OPTST_DISABLED | OPTST_STACKED \
+#define CONCURRENT_DESC      (sntp_opt_strs+1342)
+#define CONCURRENT_NAME      (sntp_opt_strs+1392)
+#define CONCURRENT_name      (sntp_opt_strs+1403)
+#define CONCURRENT_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
- *  Debug_Level option description:
+ *  debug-level option description:
  */
-static char const zDebug_LevelText[] =
-        "Increase debug verbosity level";
-static char const zDebug_Level_NAME[]        = "DEBUG_LEVEL";
-static char const zDebug_Level_Name[]        = "debug-level";
-#define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
+#define DEBUG_LEVEL_DESC      (sntp_opt_strs+1414)
+#define DEBUG_LEVEL_NAME      (sntp_opt_strs+1445)
+#define DEBUG_LEVEL_name      (sntp_opt_strs+1457)
+#define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Set_Debug_Level option description:
+ *  set-debug-level option description:
  */
-static char const zSet_Debug_LevelText[] =
-        "Set the debug verbosity 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      (sntp_opt_strs+1469)
+#define SET_DEBUG_LEVEL_NAME      (sntp_opt_strs+1499)
+#define SET_DEBUG_LEVEL_name      (sntp_opt_strs+1515)
+#define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
- *  Gap option description:
- */
-static char const zGapText[] =
-        "The gap (in milliseconds) between time requests";
-static char const zGap_NAME[]                = "GAP";
-static char const zGap_Name[]                = "gap";
-#define zGapDefaultArg               ((char const*)50)
-#define GAP_FLAGS       (OPTST_DISABLED \
+ *  gap option description:
+ */
+#define GAP_DESC      (sntp_opt_strs+1531)
+#define GAP_NAME      (sntp_opt_strs+1579)
+#define GAP_name      (sntp_opt_strs+1583)
+#define GAP_DFT_ARG   ((char const*)50)
+#define GAP_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
- *  Kod option description:
- */
-static char const zKodText[] =
-        "KoD history filename";
-static char const zKod_NAME[]                = "KOD";
-static char const zKod_Name[]                = "kod";
-static char const zKodDefaultArg[]             = "/var/db/ntp-kod";
-#define KOD_FLAGS       (OPTST_DISABLED \
+ *  kod option description:
+ */
+#define KOD_DESC      (sntp_opt_strs+1587)
+#define KOD_NAME      (sntp_opt_strs+1608)
+#define KOD_name      (sntp_opt_strs+1612)
+#define KOD_DFT_ARG   (sntp_opt_strs+1616)
+#define KOD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
 
 /*
- *  Keyfile option description:
+ *  keyfile option description:
  */
-static char const zKeyfileText[] =
-        "Look in this file for the key specified with @option{-a}";
-static char const zKeyfile_NAME[]            = "KEYFILE";
-static char const zKeyfile_Name[]            = "keyfile";
-#define KEYFILE_FLAGS       (OPTST_DISABLED \
+#define KEYFILE_DESC      (sntp_opt_strs+1632)
+#define KEYFILE_NAME      (sntp_opt_strs+1689)
+#define KEYFILE_name      (sntp_opt_strs+1697)
+#define KEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
 
 /*
- *  Logfile option description:
+ *  logfile option description:
  */
-static char const zLogfileText[] =
-        "Log to specified logfile";
-static char const zLogfile_NAME[]            = "LOGFILE";
-static char const zLogfile_Name[]            = "logfile";
-#define LOGFILE_FLAGS       (OPTST_DISABLED \
+#define LOGFILE_DESC      (sntp_opt_strs+1705)
+#define LOGFILE_NAME      (sntp_opt_strs+1730)
+#define LOGFILE_name      (sntp_opt_strs+1738)
+#define LOGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
 
 /*
- *  Steplimit option description:
+ *  steplimit option description:
  */
-static char const zSteplimitText[] =
-        "Adjustments less than @var{steplimit} msec will be slewed";
-static char const zSteplimit_NAME[]          = "STEPLIMIT";
-static char const zSteplimit_Name[]          = "steplimit";
-#define STEPLIMIT_FLAGS       (OPTST_DISABLED \
+#define STEPLIMIT_DESC      (sntp_opt_strs+1746)
+#define STEPLIMIT_NAME      (sntp_opt_strs+1804)
+#define STEPLIMIT_name      (sntp_opt_strs+1814)
+#define STEPLIMIT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
- *  Ntpversion option description:
- */
-static char const zNtpversionText[] =
-        "Send @var{int} as our NTP version";
-static char const zNtpversion_NAME[]         = "NTPVERSION";
-static char const zNtpversion_Name[]         = "ntpversion";
-#define zNtpversionDefaultArg        ((char const*)4)
-#define NTPVERSION_FLAGS       (OPTST_DISABLED \
+ *  ntpversion option description:
+ */
+#define NTPVERSION_DESC      (sntp_opt_strs+1824)
+#define NTPVERSION_NAME      (sntp_opt_strs+1858)
+#define NTPVERSION_name      (sntp_opt_strs+1869)
+#define NTPVERSION_DFT_ARG   ((char const*)4)
+#define NTPVERSION_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
- *  Usereservedport option description:
+ *  usereservedport option description:
  */
-static char const zUsereservedportText[] =
-        "Use the NTP Reserved Port (port 123)";
-static char const zUsereservedport_NAME[]    = "USERESERVEDPORT";
-static char const zUsereservedport_Name[]    = "usereservedport";
-#define USERESERVEDPORT_FLAGS       (OPTST_DISABLED)
+#define USERESERVEDPORT_DESC      (sntp_opt_strs+1880)
+#define USERESERVEDPORT_NAME      (sntp_opt_strs+1917)
+#define USERESERVEDPORT_name      (sntp_opt_strs+1933)
+#define USERESERVEDPORT_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Step option description:
+ *  step option description:
  */
-static char const zStepText[] =
-        "OK to 'step' the time with @command{settimeofday(2)}";
-static char const zStep_NAME[]               = "STEP";
-static char const zStep_Name[]               = "step";
-#define STEP_FLAGS       (OPTST_DISABLED)
+#define STEP_DESC      (sntp_opt_strs+1949)
+#define STEP_NAME      (sntp_opt_strs+2002)
+#define STEP_name      (sntp_opt_strs+2007)
+#define STEP_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Slew option description:
+ *  slew option description:
  */
-static char const zSlewText[] =
-        "OK to 'slew' the time with @command{adjtime(2)}";
-static char const zSlew_NAME[]               = "SLEW";
-static char const zSlew_Name[]               = "slew";
-#define SLEW_FLAGS       (OPTST_DISABLED)
+#define SLEW_DESC      (sntp_opt_strs+2012)
+#define SLEW_NAME      (sntp_opt_strs+2060)
+#define SLEW_name      (sntp_opt_strs+2065)
+#define SLEW_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Uctimeout option description:
- */
-static char const zUctimeoutText[] =
-        "The number of seconds to wait for unicast responses";
-static char const zUctimeout_NAME[]          = "UCTIMEOUT";
-static char const zUctimeout_Name[]          = "uctimeout";
-#define zUctimeoutDefaultArg         ((char const*)5)
-#define UCTIMEOUT_FLAGS       (OPTST_DISABLED \
+ *  uctimeout option description:
+ */
+#define UCTIMEOUT_DESC      (sntp_opt_strs+2070)
+#define UCTIMEOUT_NAME      (sntp_opt_strs+2122)
+#define UCTIMEOUT_name      (sntp_opt_strs+2132)
+#define UCTIMEOUT_DFT_ARG   ((char const*)5)
+#define UCTIMEOUT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
- *  Wait option description:
+ *  wait option description:
  */
-static char const zWaitText[] =
-        "Wait for pending replies (if not setting the time)";
-static char const zWait_NAME[]               = "WAIT";
-static char const zNotWait_Name[]            = "no-wait";
-static char const zNotWait_Pfx[]             = "no";
-#define zWait_Name                   (zNotWait_Name + 3)
-#define WAIT_FLAGS       (OPTST_INITENABLED)
+#define WAIT_DESC      (sntp_opt_strs+2142)
+#define WAIT_NAME      (sntp_opt_strs+2193)
+#define NOT_WAIT_name  (sntp_opt_strs+2198)
+#define NOT_WAIT_PFX   (sntp_opt_strs+2206)
+#define WAIT_name      (NOT_WAIT_name + 3)
+#define WAIT_FLAGS     (OPTST_INITENABLED)
 
 /*
  *  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       (sntp_opt_strs+2209)
+#define HELP_name       (sntp_opt_strs+2253)
 #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  (sntp_opt_strs+2258)
+#define MORE_HELP_name  (sntp_opt_strs+2303)
+#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        (sntp_opt_strs+2313)
+#define VER_name        (sntp_opt_strs+2349)
+#define SAVE_OPTS_DESC  (sntp_opt_strs+2357)
+#define SAVE_OPTS_name  (sntp_opt_strs+2396)
+#define LOAD_OPTS_DESC     (sntp_opt_strs+2406)
+#define LOAD_OPTS_NAME     (sntp_opt_strs+2438)
+#define NO_LOAD_OPTS_name  (sntp_opt_strs+2448)
+#define LOAD_OPTS_pfx      (sntp_opt_strs+2206)
+#define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /*
  *  Declare option callback procedures
  */
@@ -340,7 +402,7 @@ extern tOptProc
     optionBooleanVal,    optionNestedVal,     optionNumericVal,
     optionPagedUsage,    optionPrintVersion,  optionResetOpt,
     optionStackArg,      optionTimeDate,      optionTimeVal,
-    optionUnstackArg,    optionVersionStderr;
+    optionUnstackArg,    optionVendorOption,  optionVersionStderr;
 static tOptProc
     doOptKeyfile,         doOptKod,             doOptLogfile,
     doOptNtpversion,      doOptSet_Debug_Level, doOptSteplimit,
@@ -354,9 +416,9 @@ static tOptProc
 #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level
 #endif /* defined(TEST_SNTP_OPTS) */
 #ifdef TEST_SNTP_OPTS
-# define DOVERPROC optionVersionStderr
+# define VER_PROC       optionVersionStderr
 #else
-# define DOVERPROC optionPrintVersion
+# define VER_PROC       optionPrintVersion
 #endif /* TEST_SNTP_OPTS */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -369,11 +431,11 @@ 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 }, /* --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,
@@ -381,11 +443,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_AUTHENTICATION,
@@ -393,11 +455,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ AUTHENTICATION_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --authentication */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ optionNumericVal,
-     /* desc, NAME, name */ zAuthenticationText, zAuthentication_NAME, zAuthentication_Name,
+     /* desc, NAME, name */ AUTHENTICATION_DESC, AUTHENTICATION_NAME, AUTHENTICATION_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 3, VALUE_OPT_BCTIMEOUT,
@@ -405,11 +467,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ BCTIMEOUT_FLAGS, 0,
-     /* last opt argumnt */ { zBctimeoutDefaultArg },
+     /* last opt argumnt */ { BCTIMEOUT_DFT_ARG },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ optionNumericVal,
-     /* desc, NAME, name */ zBctimeoutText, zBctimeout_NAME, zBctimeout_Name,
+     /* desc, NAME, name */ BCTIMEOUT_DESC, BCTIMEOUT_NAME, BCTIMEOUT_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 4, VALUE_OPT_BROADCAST,
@@ -417,11 +479,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ BROADCAST_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --broadcast */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ optionStackArg,
-     /* desc, NAME, name */ zBroadcastText, zBroadcast_NAME, zBroadcast_Name,
+     /* desc, NAME, name */ BROADCAST_DESC, BROADCAST_NAME, BROADCAST_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 5, VALUE_OPT_CONCURRENT,
@@ -429,11 +491,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, NOLIMIT, 0,
      /* opt state flags  */ CONCURRENT_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --concurrent */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ optionStackArg,
-     /* desc, NAME, name */ zConcurrentText, zConcurrent_NAME, zConcurrent_Name,
+     /* desc, NAME, name */ CONCURRENT_DESC, CONCURRENT_NAME, CONCURRENT_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 6, VALUE_OPT_DEBUG_LEVEL,
@@ -441,11 +503,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,
@@ -453,11 +515,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_GAP,
@@ -465,11 +527,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ GAP_FLAGS, 0,
-     /* last opt argumnt */ { zGapDefaultArg },
+     /* last opt argumnt */ { GAP_DFT_ARG },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ optionNumericVal,
-     /* desc, NAME, name */ zGapText, zGap_NAME, zGap_Name,
+     /* desc, NAME, name */ GAP_DESC, GAP_NAME, GAP_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 9, VALUE_OPT_KOD,
@@ -477,11 +539,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ KOD_FLAGS, 0,
-     /* last opt argumnt */ { zKodDefaultArg },
+     /* last opt argumnt */ { KOD_DFT_ARG },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ doOptKod,
-     /* desc, NAME, name */ zKodText, zKod_NAME, zKod_Name,
+     /* desc, NAME, name */ KOD_DESC, KOD_NAME, KOD_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 10, VALUE_OPT_KEYFILE,
@@ -489,11 +551,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      */ doOptKeyfile,
-     /* desc, NAME, name */ zKeyfileText, zKeyfile_NAME, zKeyfile_Name,
+     /* desc, NAME, name */ KEYFILE_DESC, KEYFILE_NAME, KEYFILE_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 11, VALUE_OPT_LOGFILE,
@@ -501,11 +563,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      */ doOptLogfile,
-     /* desc, NAME, name */ zLogfileText, zLogfile_NAME, zLogfile_Name,
+     /* desc, NAME, name */ LOGFILE_DESC, LOGFILE_NAME, LOGFILE_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 12, VALUE_OPT_STEPLIMIT,
@@ -513,11 +575,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ STEPLIMIT_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --steplimit */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ doOptSteplimit,
-     /* desc, NAME, name */ zSteplimitText, zSteplimit_NAME, zSteplimit_Name,
+     /* desc, NAME, name */ STEPLIMIT_DESC, STEPLIMIT_NAME, STEPLIMIT_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 13, VALUE_OPT_NTPVERSION,
@@ -525,11 +587,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ NTPVERSION_FLAGS, 0,
-     /* last opt argumnt */ { zNtpversionDefaultArg },
+     /* last opt argumnt */ { NTPVERSION_DFT_ARG },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ doOptNtpversion,
-     /* desc, NAME, name */ zNtpversionText, zNtpversion_NAME, zNtpversion_Name,
+     /* desc, NAME, name */ NTPVERSION_DESC, NTPVERSION_NAME, NTPVERSION_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 14, VALUE_OPT_USERESERVEDPORT,
@@ -537,11 +599,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ USERESERVEDPORT_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --usereservedport */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zUsereservedportText, zUsereservedport_NAME, zUsereservedport_Name,
+     /* desc, NAME, name */ USERESERVEDPORT_DESC, USERESERVEDPORT_NAME, USERESERVEDPORT_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 15, VALUE_OPT_STEP,
@@ -549,11 +611,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ STEP_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --step */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zStepText, zStep_NAME, zStep_Name,
+     /* desc, NAME, name */ STEP_DESC, STEP_NAME, STEP_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 16, VALUE_OPT_SLEW,
@@ -561,11 +623,11 @@ 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 }, /* --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 */ 17, VALUE_OPT_UCTIMEOUT,
@@ -573,11 +635,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ UCTIMEOUT_FLAGS, 0,
-     /* last opt argumnt */ { zUctimeoutDefaultArg },
+     /* last opt argumnt */ { UCTIMEOUT_DFT_ARG },
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ optionNumericVal,
-     /* desc, NAME, name */ zUctimeoutText, zUctimeout_NAME, zUctimeout_Name,
+     /* desc, NAME, name */ UCTIMEOUT_DESC, UCTIMEOUT_NAME, UCTIMEOUT_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 18, VALUE_OPT_WAIT,
@@ -585,29 +647,29 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ WAIT_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --wait */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zWaitText, zWait_NAME, zWait_Name,
-     /* disablement strs */ zNotWait_Name, zNotWait_Pfx },
+     /* desc, NAME, name */ WAIT_DESC, WAIT_NAME, WAIT_name,
+     /* disablement strs */ NOT_WAIT_name, NOT_WAIT_PFX },
 
   {  /* 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,
@@ -615,23 +677,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)
@@ -640,11 +702,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)
@@ -653,30 +715,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 Sntp Option Environment
  */
-static char const zPROGNAME[5] = "SNTP";
-static char const zUsageTitle[161] =
-"sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p251\n\
-USAGE:  %s [ - [] | --[{=| }] ]... \\\n\
-\t\t[ hostname-or-IP ...]\n";
-static char const zRcName[7] = ".ntprc";
+#define zPROGNAME       (sntp_opt_strs+2461)
+#define zUsageTitle     (sntp_opt_strs+2466)
+#define zRcName         (sntp_opt_strs+2627)
 static char const * const apzHomeList[3] = {
-    "$HOME",
-    ".",
+    sntp_opt_strs+2634,
+    sntp_opt_strs+2640,
     NULL };
-
-static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
-static char const zExplain[] = "\n\n";
-#define zDetail         NULL
-static char const zFullVersion[] = SNTP_FULL_VERSION;
-/* extracted from optcode.tlib near line 515 */
+#define zBugsAddr       (sntp_opt_strs+2642)
+#define zExplain        (sntp_opt_strs+2676)
+#define zDetail         (NULL)
+#define zFullVersion    (sntp_opt_strs+2679)
+/* extracted from optcode.tlib near line 315 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -687,61 +746,9 @@ static char const zFullVersion[] = SNTP_FULL_VERSION;
 #endif /* ENABLE_NLS */
 
 
-#define sntp_full_usage NULL
-#define sntp_short_usage NULL
-#ifndef  PKGDATADIR
-# define PKGDATADIR ""
-#endif
-
-#ifndef  WITH_PACKAGER
-# define sntp_packager_info NULL
-#else
-static char const sntp_packager_info[] =
-    "Packaged by " WITH_PACKAGER
-
-# ifdef WITH_PACKAGER_VERSION
-        " ("WITH_PACKAGER_VERSION")"
-# endif
+#define sntp_full_usage (NULL)
 
-# ifdef WITH_PACKAGER_BUG_REPORTS
-    "\nReport sntp bugs to " WITH_PACKAGER_BUG_REPORTS
-# endif
-    "\n";
-#endif
-
-tOptions sntpOptions = {
-    OPTIONS_STRUCT_VERSION,
-    0, NULL,                    /* original argc + argv    */
-    ( OPTPROC_BASE
-    + OPTPROC_ERRSTOP
-    + OPTPROC_SHORTOPT
-    + OPTPROC_LONGOPT
-    + OPTPROC_NO_REQ_OPT
-    + OPTPROC_NEGATIONS
-    + OPTPROC_ENVIRON
-    + OPTPROC_MISUSE ),
-    0, NULL,                    /* current option index, current option */
-    NULL,         NULL,         zPROGNAME,
-    zRcName,      zCopyright,   zLicenseDescrip,
-    zFullVersion, apzHomeList,  zUsageTitle,
-    zExplain,     zDetail,      optDesc,
-    zBugsAddr,                  /* address to send bugs to */
-    NULL, NULL,                 /* extensions/saved state  */
-    optionUsage, /* usage procedure */
-    translate_option_strings,   /* translation procedure */
-    /*
-     *  Indexes to special options
-     */
-    { INDEX_OPT_MORE_HELP, /* more-help option index */
-      INDEX_OPT_SAVE_OPTS, /* save option index */
-      NO_EQUIVALENT, /* '-#' option index */
-      NO_EQUIVALENT /* index of default opt */
-    },
-    24 /* full option count */, 19 /* user option count */,
-    sntp_full_usage, sntp_short_usage,
-    NULL, NULL,
-    PKGDATADIR, sntp_packager_info
-};
+#define sntp_short_usage (NULL)
 
 /*
  *  Create the static procedure(s) declared above.
@@ -828,7 +835,7 @@ doOptLogfile(tOptions* pOptions, tOptDesc* pOptDesc)
 static void
 doOptSteplimit(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    static const struct {long const rmin, rmax;} rng[1] = {
+    static struct {long rmin, rmax;} const rng[1] = {
         { 0, LONG_MAX } };
     int  ix;
 
@@ -861,7 +868,7 @@ emit_ranges:
 static void
 doOptNtpversion(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    static const struct {long const rmin, rmax;} rng[1] = {
+    static struct {long rmin, rmax;} const rng[1] = {
         { 0, 7 } };
     int  ix;
 
@@ -904,7 +911,61 @@ main(int argc, char ** argv)
     return res;
 }
 #endif  /* defined TEST_SNTP_OPTS */
-/* extracted from optcode.tlib near line 666 */
+/* extracted from optmain.tlib near line 1148 */
+
+#ifndef  PKGDATADIR
+# define PKGDATADIR ""
+#endif
+
+#ifndef  WITH_PACKAGER
+# define sntp_packager_info NULL
+#else
+static char const sntp_packager_info[] =
+    "Packaged by " WITH_PACKAGER
+
+# ifdef WITH_PACKAGER_VERSION
+        " ("WITH_PACKAGER_VERSION")"
+# endif
+
+# ifdef WITH_PACKAGER_BUG_REPORTS
+    "\nReport sntp bugs to " WITH_PACKAGER_BUG_REPORTS
+# endif
+    "\n";
+#endif
+
+tOptions sntpOptions = {
+    OPTIONS_STRUCT_VERSION,
+    0, NULL,                    /* original argc + argv    */
+    ( OPTPROC_BASE
+    + OPTPROC_ERRSTOP
+    + OPTPROC_SHORTOPT
+    + OPTPROC_LONGOPT
+    + OPTPROC_NO_REQ_OPT
+    + OPTPROC_NEGATIONS
+    + OPTPROC_ENVIRON
+    + OPTPROC_MISUSE ),
+    0, NULL,                    /* current option index, current option */
+    NULL,         NULL,         zPROGNAME,
+    zRcName,      zCopyright,   zLicenseDescrip,
+    zFullVersion, apzHomeList,  zUsageTitle,
+    zExplain,     zDetail,      optDesc,
+    zBugsAddr,                  /* address to send bugs to */
+    NULL, NULL,                 /* extensions/saved state  */
+    optionUsage, /* usage procedure */
+    translate_option_strings,   /* translation procedure */
+    /*
+     *  Indexes to special options
+     */
+    { INDEX_OPT_MORE_HELP, /* more-help option index */
+      INDEX_OPT_SAVE_OPTS, /* save option index */
+      NO_EQUIVALENT, /* '-#' option index */
+      NO_EQUIVALENT /* index of default opt */
+    },
+    24 /* full option count */, 19 /* user option count */,
+    sntp_full_usage, sntp_short_usage,
+    NULL, NULL,
+    PKGDATADIR, sntp_packager_info
+};
 
 #if ENABLE_NLS
 #include 
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index b4dd814e71..4458f4cf44 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  January 17, 2012 at 11:26:00 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  January 25, 2012 at 12:05:08 PM by AutoGen 5.14
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 35:0:10 templates.
+ * Generated from AutoOpts 36:1: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,7 +15,8 @@
  *  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 sntp program is copyrighted and licensed
+ * under the following terms:
  *
  *  Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved.
  *  This is free software. It is licensed for use, modification and
@@ -23,8 +24,8 @@
  *  can be seen at:
  *    
  *    
- *  
-PFX>Permission to use, copy, modify, and distribute this software and its
+ *
+ *  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
@@ -52,7 +53,7 @@ PFX>Permission to use, copy, modify, and distribute this software and its
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 143360
+#define AO_TEMPLATE_VERSION 147457
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -90,8 +91,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define SNTP_VERSION       "4.2.7p251"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p251"
+#define SNTP_VERSION       "4.2.7p252"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p252"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -288,12 +289,13 @@ typedef enum {
                 sntpOptions.pzCurOpt  = NULL)
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*sntpOptions.pUsageProc)(&sntpOptions, c)
-/* extracted from opthead.tlib near line 451 */
+/* extracted from opthead.tlib near line 469 */
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
+
 /* * * * * *
  *
  *  Declare the sntp option descriptor.
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 8e24d63c3a..00a8ddd78d 100644
--- a/sntp/sntp-opts.texi
+++ b/sntp/sntp-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  January 17, 2012 at 11:35:21 AM by AutoGen 5.12
+# It has been AutoGen-ed  January 25, 2012 at 12:05:27 PM by AutoGen 5.14
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -85,13 +85,13 @@ This software is released under a specialized copyright license.
 
 @node sntp usage
 @subsection sntp usage help (-?)
-@cindex sntp usage
+@cindex sntp-usage
 
 This is the automatically generated usage text for sntp:
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p251
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p252
 USAGE:  sntp [ - [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index f03a4855bd..ceb9e3b0e4 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "17 Jan 2012" "4.2.7p251" "User Commands"
+.TH sntp 1sntpman "25 Jan 2012" "4.2.7p252" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:35:18 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:24 PM by AutoGen 5.14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index fd42382296..f93c5ed303 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd January 17 2012
+.Dd January 25 2012
 .Dt SNTP 1sntpmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:35:22 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:27 PM by AutoGen 5.14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/sntp.html b/sntp/sntp.html
index b58a17502f..dda9f43147 100644
--- a/sntp/sntp.html
+++ b/sntp/sntp.html
@@ -36,7 +36,7 @@ display the time offset of the system clock relative to the server
 clock.  Run as root, it can correct the system clock to this offset as
 well.  It can be run as an interactive command or from a cron job.
 
-  
This document applies to version 4.2.7p251 of sntp.
+  
This document applies to version 4.2.7p252 of sntp.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -159,10 +159,10 @@ Up: sntp Invocation
 
 
sntp usage help (-?)

 
-

+

 This is the automatically generated usage text for sntp:
 
-
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p251
+
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p252
 USAGE:  sntp [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index aa92fdb2a5..79c0118174 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "17 Jan 2012" "4.2.7p251" "User Commands"
+.TH sntp @SNTP_MS@ "25 Jan 2012" "4.2.7p252" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:35:18 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:24 PM by AutoGen 5.14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index a465b024e0..8c33e47048 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 17 2012
+.Dd January 25 2012
 .Dt SNTP @SNTP_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:35:22 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:27 PM by AutoGen 5.14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 99e063b22d..780074b65e 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  January 17, 2012 at 11:34:50 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  January 25, 2012 at 12:04:51 PM by AutoGen 5.14
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 35:0:10 templates.
+ * Generated from AutoOpts 36:1: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,7 +15,8 @@
  *  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 ntp-keygen program is copyrighted and licensed
+ * under the following terms:
  *
  *  Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved.
  *  This is free software. It is licensed for use, modification and
@@ -23,8 +24,8 @@
  *  can be seen at:
  *    
  *    
- *  
-PFX>Permission to use, copy, modify, and distribute this software and its
+ *
+ *  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
@@ -40,10 +41,10 @@ PFX>Permission to use, copy, modify, and distribute this software and its
 #include 
 #include 
 #include 
-#include 
+
 #define OPTION_CODE_COMPILE 1
 #include "ntp-keygen-opts.h"
-
+#include 
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -51,32 +52,14 @@ extern FILE * option_usage_fp;
 
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
-static char const zCopyright[345] =
-"ntp-keygen (ntp) 4.2.7p251\n\
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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";
-static char const zLicenseDescrip[700] =
-"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, David L.\n\
-Mills, and/or others not be used in advertising or publicity pertaining to\n\
-distribution of the software without specific, written prior permission.\n\
-The University of Delaware, David L. Mills, and/or others makes no\n\
-representations about the suitability this software for any purpose. It is\n\
-provided \"as is\" without express or implied warranty.\n";
+#define zCopyright      (ntp_keygen_opt_strs+0)
+#define zLicenseDescrip (ntp_keygen_opt_strs+345)
 
 extern tUsageProc optionUsage;
-
 /*
  *  global included definitions
- */
-#include 
+ */#include 
+
 #ifdef __windows
   extern int atoi(const char*);
 #else
@@ -88,363 +71,444 @@ extern tUsageProc optionUsage;
 #endif
 
 /*
- *  Certificate option description:
+ *  ntp-keygen option static const strings
+ */
+static char const ntp_keygen_opt_strs[2401] =
+/*     0 */ "ntp-keygen (ntp) 4.2.7p252\n"
+            "Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, 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"
+/*   345 */ "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, David L.\n"
+            "Mills, and/or others not be used in advertising or publicity pertaining to\n"
+            "distribution of the software without specific, written prior permission.\n"
+            "The University of Delaware, David L. Mills, and/or others 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"
+/*  1045 */ "certificate scheme\0"
+/*  1064 */ "CERTIFICATE\0"
+/*  1076 */ "certificate\0"
+/*  1088 */ "privatekey cipher\0"
+/*  1106 */ "CIPHER\0"
+/*  1113 */ "cipher\0"
+/*  1120 */ "Increase debug verbosity level\0"
+/*  1151 */ "DEBUG_LEVEL\0"
+/*  1163 */ "debug-level\0"
+/*  1175 */ "Set the debug verbosity level\0"
+/*  1205 */ "SET_DEBUG_LEVEL\0"
+/*  1221 */ "set-debug-level\0"
+/*  1237 */ "Write IFF or GQ identity keys\0"
+/*  1267 */ "ID_KEY\0"
+/*  1274 */ "id-key\0"
+/*  1281 */ "Generate GQ parameters and keys\0"
+/*  1313 */ "GQ_PARAMS\0"
+/*  1323 */ "gq-params\0"
+/*  1333 */ "generate RSA host key\0"
+/*  1355 */ "HOST_KEY\0"
+/*  1364 */ "host-key\0"
+/*  1373 */ "generate IFF parameters\0"
+/*  1397 */ "IFFKEY\0"
+/*  1404 */ "iffkey\0"
+/*  1411 */ "set Autokey group name\0"
+/*  1434 */ "IDENT\0"
+/*  1440 */ "ident\0"
+/*  1446 */ "set certificate lifetime\0"
+/*  1471 */ "LIFETIME\0"
+/*  1480 */ "lifetime\0"
+/*  1489 */ "generate MD5 keys\0"
+/*  1507 */ "MD5KEY\0"
+/*  1514 */ "md5key\0"
+/*  1521 */ "modulus\0"
+/*  1529 */ "MODULUS\0"
+/*  1537 */ "generate PC private certificate\0"
+/*  1569 */ "PVT_CERT\0"
+/*  1578 */ "pvt-cert\0"
+/*  1587 */ "output private password\0"
+/*  1611 */ "PVT_PASSWD\0"
+/*  1622 */ "pvt-passwd\0"
+/*  1633 */ "input private password\0"
+/*  1656 */ "GET_PVT_PASSWD\0"
+/*  1671 */ "get-pvt-passwd\0"
+/*  1686 */ "generate sign key (RSA or DSA)\0"
+/*  1717 */ "SIGN_KEY\0"
+/*  1726 */ "sign-key\0"
+/*  1735 */ "set host and optionally group name\0"
+/*  1770 */ "SUBJECT_NAME\0"
+/*  1783 */ "subject-name\0"
+/*  1796 */ "trusted certificate (TC scheme)\0"
+/*  1828 */ "TRUSTED_CERT\0"
+/*  1841 */ "trusted-cert\0"
+/*  1854 */ "generate  MV parameters\0"
+/*  1883 */ "MV_PARAMS\0"
+/*  1893 */ "mv-params\0"
+/*  1903 */ "update  MV keys\0"
+/*  1924 */ "MV_KEYS\0"
+/*  1932 */ "mv-keys\0"
+/*  1940 */ "Display extended usage information and exit\0"
+/*  1984 */ "help\0"
+/*  1989 */ "Extended usage information passed thru pager\0"
+/*  2034 */ "more-help\0"
+/*  2044 */ "Output version information and exit\0"
+/*  2080 */ "version\0"
+/*  2088 */ "Save the option state to a config file\0"
+/*  2127 */ "save-opts\0"
+/*  2137 */ "Load options from a config file\0"
+/*  2169 */ "LOAD_OPTS\0"
+/*  2179 */ "no-load-opts\0"
+/*  2192 */ "no\0"
+/*  2195 */ "NTP_KEYGEN\0"
+/*  2206 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p252\n"
+            "USAGE:  %s [ - [] | --[{=| }] ]...\n\0"
+/*  2322 */ ".ntprc\0"
+/*  2329 */ "$HOME\0"
+/*  2335 */ ".\0"
+/*  2337 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  2371 */ "\n\n\0"
+/*  2374 */ "ntp-keygen (ntp) 4.2.7p252";
+
+/*
+ *  certificate option description:
  */
 #ifdef AUTOKEY
-static char const zCertificateText[] =
-        "certificate scheme";
-static char const zCertificate_NAME[]        = "CERTIFICATE";
-static char const zCertificate_Name[]        = "certificate";
-#define CERTIFICATE_FLAGS       (OPTST_DISABLED \
+#define CERTIFICATE_DESC      (ntp_keygen_opt_strs+1045)
+#define CERTIFICATE_NAME      (ntp_keygen_opt_strs+1064)
+#define CERTIFICATE_name      (ntp_keygen_opt_strs+1076)
+#define CERTIFICATE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-#else   /* disable Certificate */
-#define CERTIFICATE_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zCertificate_NAME      NULL
-#define zCertificateText       NULL
-#define zCertificate_Name      NULL
+#else   /* disable certificate */
+#define CERTIFICATE_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define CERTIFICATE_NAME      NULL
+#define CERTIFICATE_DESC      NULL
+#define CERTIFICATE_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Cipher option description:
+ *  cipher option description:
  */
 #ifdef AUTOKEY
-static char const zCipherText[] =
-        "privatekey cipher";
-static char const zCipher_NAME[]             = "CIPHER";
-static char const zCipher_Name[]             = "cipher";
-#define CIPHER_FLAGS       (OPTST_DISABLED \
+#define CIPHER_DESC      (ntp_keygen_opt_strs+1088)
+#define CIPHER_NAME      (ntp_keygen_opt_strs+1106)
+#define CIPHER_name      (ntp_keygen_opt_strs+1113)
+#define CIPHER_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-#else   /* disable Cipher */
-#define CIPHER_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zCipher_NAME      NULL
-#define zCipherText       NULL
-#define zCipher_Name      NULL
+#else   /* disable cipher */
+#define CIPHER_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define CIPHER_NAME      NULL
+#define CIPHER_DESC      NULL
+#define CIPHER_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Debug_Level option description:
+ *  debug-level option description:
  */
-static char const zDebug_LevelText[] =
-        "Increase debug verbosity level";
-static char const zDebug_Level_NAME[]        = "DEBUG_LEVEL";
-static char const zDebug_Level_Name[]        = "debug-level";
-#define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
+#define DEBUG_LEVEL_DESC      (ntp_keygen_opt_strs+1120)
+#define DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1151)
+#define DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1163)
+#define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Set_Debug_Level option description:
+ *  set-debug-level option description:
  */
-static char const zSet_Debug_LevelText[] =
-        "Set the debug verbosity 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      (ntp_keygen_opt_strs+1175)
+#define SET_DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1205)
+#define SET_DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1221)
+#define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
- *  Id_Key option description:
+ *  id-key option description:
  */
 #ifdef AUTOKEY
-static char const zId_KeyText[] =
-        "Write IFF or GQ identity keys";
-static char const zId_Key_NAME[]             = "ID_KEY";
-static char const zId_Key_Name[]             = "id-key";
-#define ID_KEY_FLAGS       (OPTST_DISABLED)
-
-#else   /* disable Id_Key */
-#define ID_KEY_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zId_Key_NAME      NULL
-#define zId_KeyText       NULL
-#define zId_Key_Name      NULL
+#define ID_KEY_DESC      (ntp_keygen_opt_strs+1237)
+#define ID_KEY_NAME      (ntp_keygen_opt_strs+1267)
+#define ID_KEY_name      (ntp_keygen_opt_strs+1274)
+#define ID_KEY_FLAGS     (OPTST_DISABLED)
+
+#else   /* disable id-key */
+#define ID_KEY_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define ID_KEY_NAME      NULL
+#define ID_KEY_DESC      NULL
+#define ID_KEY_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Gq_Params option description:
+ *  gq-params option description:
  */
 #ifdef AUTOKEY
-static char const zGq_ParamsText[] =
-        "Generate GQ parameters and keys";
-static char const zGq_Params_NAME[]          = "GQ_PARAMS";
-static char const zGq_Params_Name[]          = "gq-params";
-#define GQ_PARAMS_FLAGS       (OPTST_DISABLED)
-
-#else   /* disable Gq_Params */
-#define GQ_PARAMS_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zGq_Params_NAME      NULL
-#define zGq_ParamsText       NULL
-#define zGq_Params_Name      NULL
+#define GQ_PARAMS_DESC      (ntp_keygen_opt_strs+1281)
+#define GQ_PARAMS_NAME      (ntp_keygen_opt_strs+1313)
+#define GQ_PARAMS_name      (ntp_keygen_opt_strs+1323)
+#define GQ_PARAMS_FLAGS     (OPTST_DISABLED)
+
+#else   /* disable gq-params */
+#define GQ_PARAMS_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define GQ_PARAMS_NAME      NULL
+#define GQ_PARAMS_DESC      NULL
+#define GQ_PARAMS_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Host_Key option description:
+ *  host-key option description:
  */
 #ifdef AUTOKEY
-static char const zHost_KeyText[] =
-        "generate RSA host key";
-static char const zHost_Key_NAME[]           = "HOST_KEY";
-static char const zHost_Key_Name[]           = "host-key";
-#define HOST_KEY_FLAGS       (OPTST_DISABLED)
-
-#else   /* disable Host_Key */
-#define HOST_KEY_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zHost_Key_NAME      NULL
-#define zHost_KeyText       NULL
-#define zHost_Key_Name      NULL
+#define HOST_KEY_DESC      (ntp_keygen_opt_strs+1333)
+#define HOST_KEY_NAME      (ntp_keygen_opt_strs+1355)
+#define HOST_KEY_name      (ntp_keygen_opt_strs+1364)
+#define HOST_KEY_FLAGS     (OPTST_DISABLED)
+
+#else   /* disable host-key */
+#define HOST_KEY_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define HOST_KEY_NAME      NULL
+#define HOST_KEY_DESC      NULL
+#define HOST_KEY_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Iffkey option description:
+ *  iffkey option description:
  */
 #ifdef AUTOKEY
-static char const zIffkeyText[] =
-        "generate IFF parameters";
-static char const zIffkey_NAME[]             = "IFFKEY";
-static char const zIffkey_Name[]             = "iffkey";
-#define IFFKEY_FLAGS       (OPTST_DISABLED)
-
-#else   /* disable Iffkey */
-#define IFFKEY_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zIffkey_NAME      NULL
-#define zIffkeyText       NULL
-#define zIffkey_Name      NULL
+#define IFFKEY_DESC      (ntp_keygen_opt_strs+1373)
+#define IFFKEY_NAME      (ntp_keygen_opt_strs+1397)
+#define IFFKEY_name      (ntp_keygen_opt_strs+1404)
+#define IFFKEY_FLAGS     (OPTST_DISABLED)
+
+#else   /* disable iffkey */
+#define IFFKEY_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define IFFKEY_NAME      NULL
+#define IFFKEY_DESC      NULL
+#define IFFKEY_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Ident option description:
+ *  ident option description:
  */
 #ifdef AUTOKEY
-static char const zIdentText[] =
-        "set Autokey group name";
-static char const zIdent_NAME[]              = "IDENT";
-static char const zIdent_Name[]              = "ident";
-#define IDENT_FLAGS       (OPTST_DISABLED \
+#define IDENT_DESC      (ntp_keygen_opt_strs+1411)
+#define IDENT_NAME      (ntp_keygen_opt_strs+1434)
+#define IDENT_name      (ntp_keygen_opt_strs+1440)
+#define IDENT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-#else   /* disable Ident */
-#define IDENT_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zIdent_NAME      NULL
-#define zIdentText       NULL
-#define zIdent_Name      NULL
+#else   /* disable ident */
+#define IDENT_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define IDENT_NAME      NULL
+#define IDENT_DESC      NULL
+#define IDENT_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Lifetime option description:
+ *  lifetime option description:
  */
 #ifdef AUTOKEY
-static char const zLifetimeText[] =
-        "set certificate lifetime";
-static char const zLifetime_NAME[]           = "LIFETIME";
-static char const zLifetime_Name[]           = "lifetime";
-#define LIFETIME_FLAGS       (OPTST_DISABLED \
+#define LIFETIME_DESC      (ntp_keygen_opt_strs+1446)
+#define LIFETIME_NAME      (ntp_keygen_opt_strs+1471)
+#define LIFETIME_name      (ntp_keygen_opt_strs+1480)
+#define LIFETIME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
-#else   /* disable Lifetime */
-#define LIFETIME_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zLifetime_NAME      NULL
-#define zLifetimeText       NULL
-#define zLifetime_Name      NULL
+#else   /* disable lifetime */
+#define LIFETIME_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define LIFETIME_NAME      NULL
+#define LIFETIME_DESC      NULL
+#define LIFETIME_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Md5key option description:
+ *  md5key option description:
  */
-static char const zMd5keyText[] =
-        "generate MD5 keys";
-static char const zMd5key_NAME[]             = "MD5KEY";
-static char const zMd5key_Name[]             = "md5key";
-#define MD5KEY_FLAGS       (OPTST_DISABLED)
+#define MD5KEY_DESC      (ntp_keygen_opt_strs+1489)
+#define MD5KEY_NAME      (ntp_keygen_opt_strs+1507)
+#define MD5KEY_name      (ntp_keygen_opt_strs+1514)
+#define MD5KEY_FLAGS     (OPTST_DISABLED)
 
 /*
- *  Modulus option description:
+ *  modulus option description:
  */
 #ifdef AUTOKEY
-static char const zModulusText[] =
-        "modulus";
-static char const zModulus_NAME[]            = "MODULUS";
-static char const zModulus_Name[]            = "modulus";
-#define MODULUS_FLAGS       (OPTST_DISABLED \
+#define MODULUS_DESC      (ntp_keygen_opt_strs+1521)
+#define MODULUS_NAME      (ntp_keygen_opt_strs+1529)
+#define MODULUS_name      (ntp_keygen_opt_strs+1521)
+#define MODULUS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
-#else   /* disable Modulus */
-#define MODULUS_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zModulus_NAME      NULL
-#define zModulusText       NULL
-#define zModulus_Name      NULL
+#else   /* disable modulus */
+#define MODULUS_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define MODULUS_NAME      NULL
+#define MODULUS_DESC      NULL
+#define MODULUS_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Pvt_Cert option description:
+ *  pvt-cert option description:
  */
 #ifdef AUTOKEY
-static char const zPvt_CertText[] =
-        "generate PC private certificate";
-static char const zPvt_Cert_NAME[]           = "PVT_CERT";
-static char const zPvt_Cert_Name[]           = "pvt-cert";
-#define PVT_CERT_FLAGS       (OPTST_DISABLED)
-
-#else   /* disable Pvt_Cert */
-#define PVT_CERT_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zPvt_Cert_NAME      NULL
-#define zPvt_CertText       NULL
-#define zPvt_Cert_Name      NULL
+#define PVT_CERT_DESC      (ntp_keygen_opt_strs+1537)
+#define PVT_CERT_NAME      (ntp_keygen_opt_strs+1569)
+#define PVT_CERT_name      (ntp_keygen_opt_strs+1578)
+#define PVT_CERT_FLAGS     (OPTST_DISABLED)
+
+#else   /* disable pvt-cert */
+#define PVT_CERT_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define PVT_CERT_NAME      NULL
+#define PVT_CERT_DESC      NULL
+#define PVT_CERT_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Pvt_Passwd option description:
+ *  pvt-passwd option description:
  */
 #ifdef AUTOKEY
-static char const zPvt_PasswdText[] =
-        "output private password";
-static char const zPvt_Passwd_NAME[]         = "PVT_PASSWD";
-static char const zPvt_Passwd_Name[]         = "pvt-passwd";
-#define PVT_PASSWD_FLAGS       (OPTST_DISABLED \
+#define PVT_PASSWD_DESC      (ntp_keygen_opt_strs+1587)
+#define PVT_PASSWD_NAME      (ntp_keygen_opt_strs+1611)
+#define PVT_PASSWD_name      (ntp_keygen_opt_strs+1622)
+#define PVT_PASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-#else   /* disable Pvt_Passwd */
-#define PVT_PASSWD_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zPvt_Passwd_NAME      NULL
-#define zPvt_PasswdText       NULL
-#define zPvt_Passwd_Name      NULL
+#else   /* disable pvt-passwd */
+#define PVT_PASSWD_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define PVT_PASSWD_NAME      NULL
+#define PVT_PASSWD_DESC      NULL
+#define PVT_PASSWD_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Get_Pvt_Passwd option description:
+ *  get-pvt-passwd option description:
  */
 #ifdef AUTOKEY
-static char const zGet_Pvt_PasswdText[] =
-        "input private password";
-static char const zGet_Pvt_Passwd_NAME[]     = "GET_PVT_PASSWD";
-static char const zGet_Pvt_Passwd_Name[]     = "get-pvt-passwd";
-#define GET_PVT_PASSWD_FLAGS       (OPTST_DISABLED \
+#define GET_PVT_PASSWD_DESC      (ntp_keygen_opt_strs+1633)
+#define GET_PVT_PASSWD_NAME      (ntp_keygen_opt_strs+1656)
+#define GET_PVT_PASSWD_name      (ntp_keygen_opt_strs+1671)
+#define GET_PVT_PASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-#else   /* disable Get_Pvt_Passwd */
-#define GET_PVT_PASSWD_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zGet_Pvt_Passwd_NAME      NULL
-#define zGet_Pvt_PasswdText       NULL
-#define zGet_Pvt_Passwd_Name      NULL
+#else   /* disable get-pvt-passwd */
+#define GET_PVT_PASSWD_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define GET_PVT_PASSWD_NAME      NULL
+#define GET_PVT_PASSWD_DESC      NULL
+#define GET_PVT_PASSWD_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Sign_Key option description:
+ *  sign-key option description:
  */
 #ifdef AUTOKEY
-static char const zSign_KeyText[] =
-        "generate sign key (RSA or DSA)";
-static char const zSign_Key_NAME[]           = "SIGN_KEY";
-static char const zSign_Key_Name[]           = "sign-key";
-#define SIGN_KEY_FLAGS       (OPTST_DISABLED \
+#define SIGN_KEY_DESC      (ntp_keygen_opt_strs+1686)
+#define SIGN_KEY_NAME      (ntp_keygen_opt_strs+1717)
+#define SIGN_KEY_name      (ntp_keygen_opt_strs+1726)
+#define SIGN_KEY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-#else   /* disable Sign_Key */
-#define SIGN_KEY_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zSign_Key_NAME      NULL
-#define zSign_KeyText       NULL
-#define zSign_Key_Name      NULL
+#else   /* disable sign-key */
+#define SIGN_KEY_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define SIGN_KEY_NAME      NULL
+#define SIGN_KEY_DESC      NULL
+#define SIGN_KEY_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Subject_Name option description:
+ *  subject-name option description:
  */
 #ifdef AUTOKEY
-static char const zSubject_NameText[] =
-        "set host and optionally group name";
-static char const zSubject_Name_NAME[]       = "SUBJECT_NAME";
-static char const zSubject_Name_Name[]       = "subject-name";
-#define SUBJECT_NAME_FLAGS       (OPTST_DISABLED \
+#define SUBJECT_NAME_DESC      (ntp_keygen_opt_strs+1735)
+#define SUBJECT_NAME_NAME      (ntp_keygen_opt_strs+1770)
+#define SUBJECT_NAME_name      (ntp_keygen_opt_strs+1783)
+#define SUBJECT_NAME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
-#else   /* disable Subject_Name */
-#define SUBJECT_NAME_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zSubject_Name_NAME      NULL
-#define zSubject_NameText       NULL
-#define zSubject_Name_Name      NULL
+#else   /* disable subject-name */
+#define SUBJECT_NAME_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define SUBJECT_NAME_NAME      NULL
+#define SUBJECT_NAME_DESC      NULL
+#define SUBJECT_NAME_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Trusted_Cert option description:
+ *  trusted-cert option description:
  */
 #ifdef AUTOKEY
-static char const zTrusted_CertText[] =
-        "trusted certificate (TC scheme)";
-static char const zTrusted_Cert_NAME[]       = "TRUSTED_CERT";
-static char const zTrusted_Cert_Name[]       = "trusted-cert";
-#define TRUSTED_CERT_FLAGS       (OPTST_DISABLED)
-
-#else   /* disable Trusted_Cert */
-#define TRUSTED_CERT_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zTrusted_Cert_NAME      NULL
-#define zTrusted_CertText       NULL
-#define zTrusted_Cert_Name      NULL
+#define TRUSTED_CERT_DESC      (ntp_keygen_opt_strs+1796)
+#define TRUSTED_CERT_NAME      (ntp_keygen_opt_strs+1828)
+#define TRUSTED_CERT_name      (ntp_keygen_opt_strs+1841)
+#define TRUSTED_CERT_FLAGS     (OPTST_DISABLED)
+
+#else   /* disable trusted-cert */
+#define TRUSTED_CERT_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define TRUSTED_CERT_NAME      NULL
+#define TRUSTED_CERT_DESC      NULL
+#define TRUSTED_CERT_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Mv_Params option description:
+ *  mv-params option description:
  */
 #ifdef AUTOKEY
-static char const zMv_ParamsText[] =
-        "generate  MV parameters";
-static char const zMv_Params_NAME[]          = "MV_PARAMS";
-static char const zMv_Params_Name[]          = "mv-params";
-#define MV_PARAMS_FLAGS       (OPTST_DISABLED \
+#define MV_PARAMS_DESC      (ntp_keygen_opt_strs+1854)
+#define MV_PARAMS_NAME      (ntp_keygen_opt_strs+1883)
+#define MV_PARAMS_name      (ntp_keygen_opt_strs+1893)
+#define MV_PARAMS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
-#else   /* disable Mv_Params */
-#define MV_PARAMS_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zMv_Params_NAME      NULL
-#define zMv_ParamsText       NULL
-#define zMv_Params_Name      NULL
+#else   /* disable mv-params */
+#define MV_PARAMS_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define MV_PARAMS_NAME      NULL
+#define MV_PARAMS_DESC      NULL
+#define MV_PARAMS_name      NULL
 #endif  /* AUTOKEY */
 
 /*
- *  Mv_Keys option description:
+ *  mv-keys option description:
  */
 #ifdef AUTOKEY
-static char const zMv_KeysText[] =
-        "update  MV keys";
-static char const zMv_Keys_NAME[]            = "MV_KEYS";
-static char const zMv_Keys_Name[]            = "mv-keys";
-#define MV_KEYS_FLAGS       (OPTST_DISABLED \
+#define MV_KEYS_DESC      (ntp_keygen_opt_strs+1903)
+#define MV_KEYS_NAME      (ntp_keygen_opt_strs+1924)
+#define MV_KEYS_name      (ntp_keygen_opt_strs+1932)
+#define MV_KEYS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
-#else   /* disable Mv_Keys */
-#define MV_KEYS_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
-#define zMv_Keys_NAME      NULL
-#define zMv_KeysText       NULL
-#define zMv_Keys_Name      NULL
+#else   /* disable mv-keys */
+#define MV_KEYS_FLAGS     (OPTST_OMITTED | OPTST_NO_INIT)
+#define MV_KEYS_NAME      NULL
+#define MV_KEYS_DESC      NULL
+#define MV_KEYS_name      NULL
 #endif  /* AUTOKEY */
 
 /*
  *  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       (ntp_keygen_opt_strs+1940)
+#define HELP_name       (ntp_keygen_opt_strs+1984)
 #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  (ntp_keygen_opt_strs+1989)
+#define MORE_HELP_name  (ntp_keygen_opt_strs+2034)
+#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        (ntp_keygen_opt_strs+2044)
+#define VER_name        (ntp_keygen_opt_strs+2080)
+#define SAVE_OPTS_DESC  (ntp_keygen_opt_strs+2088)
+#define SAVE_OPTS_name  (ntp_keygen_opt_strs+2127)
+#define LOAD_OPTS_DESC     (ntp_keygen_opt_strs+2137)
+#define LOAD_OPTS_NAME     (ntp_keygen_opt_strs+2169)
+#define NO_LOAD_OPTS_name  (ntp_keygen_opt_strs+2179)
+#define LOAD_OPTS_pfx      (ntp_keygen_opt_strs+2192)
+#define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /*
  *  Declare option callback procedures
  */
@@ -475,7 +539,7 @@ extern tOptProc
     optionBooleanVal,    optionNestedVal,     optionNumericVal,
     optionPagedUsage,    optionPrintVersion,  optionResetOpt,
     optionStackArg,      optionTimeDate,      optionTimeVal,
-    optionUnstackArg,    optionVersionStderr;
+    optionUnstackArg,    optionVendorOption,  optionVersionStderr;
 static tOptProc
     doOptSet_Debug_Level, doUsageOpt;
 
@@ -487,9 +551,9 @@ static tOptProc
 #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level
 #endif /* defined(TEST_NTP_KEYGEN_OPTS) */
 #ifdef TEST_NTP_KEYGEN_OPTS
-# define DOVERPROC optionVersionStderr
+# define VER_PROC       optionVersionStderr
 #else
-# define DOVERPROC optionPrintVersion
+# define VER_PROC       optionPrintVersion
 #endif /* TEST_NTP_KEYGEN_OPTS */
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -502,11 +566,11 @@ 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 }, /* --certificate */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zCertificateText, zCertificate_NAME, zCertificate_Name,
+     /* desc, NAME, name */ CERTIFICATE_DESC, CERTIFICATE_NAME, CERTIFICATE_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 1, VALUE_OPT_CIPHER,
@@ -514,11 +578,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ CIPHER_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --cipher */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zCipherText, zCipher_NAME, zCipher_Name,
+     /* desc, NAME, name */ CIPHER_DESC, CIPHER_NAME, CIPHER_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 2, VALUE_OPT_DEBUG_LEVEL,
@@ -526,11 +590,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 */ 3, VALUE_OPT_SET_DEBUG_LEVEL,
@@ -538,11 +602,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 */ 4, VALUE_OPT_ID_KEY,
@@ -550,11 +614,11 @@ 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 }, /* --id-key */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zId_KeyText, zId_Key_NAME, zId_Key_Name,
+     /* desc, NAME, name */ ID_KEY_DESC, ID_KEY_NAME, ID_KEY_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 5, VALUE_OPT_GQ_PARAMS,
@@ -562,11 +626,11 @@ 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 }, /* --gq-params */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zGq_ParamsText, zGq_Params_NAME, zGq_Params_Name,
+     /* desc, NAME, name */ GQ_PARAMS_DESC, GQ_PARAMS_NAME, GQ_PARAMS_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 6, VALUE_OPT_HOST_KEY,
@@ -574,11 +638,11 @@ 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 }, /* --host-key */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zHost_KeyText, zHost_Key_NAME, zHost_Key_Name,
+     /* desc, NAME, name */ HOST_KEY_DESC, HOST_KEY_NAME, HOST_KEY_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 7, VALUE_OPT_IFFKEY,
@@ -586,11 +650,11 @@ 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 }, /* --iffkey */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zIffkeyText, zIffkey_NAME, zIffkey_Name,
+     /* desc, NAME, name */ IFFKEY_DESC, IFFKEY_NAME, IFFKEY_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 8, VALUE_OPT_IDENT,
@@ -598,11 +662,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ IDENT_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --ident */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zIdentText, zIdent_NAME, zIdent_Name,
+     /* desc, NAME, name */ IDENT_DESC, IDENT_NAME, IDENT_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 9, VALUE_OPT_LIFETIME,
@@ -610,11 +674,11 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* equivalenced to  */ NO_EQUIVALENT,
      /* min, max, act ct */ 0, 1, 0,
      /* opt state flags  */ LIFETIME_FLAGS, 0,
-     /* last opt argumnt */ { NULL },
+     /* last opt argumnt */ { NULL }, /* --lifetime */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ optionNumericVal,
-     /* desc, NAME, name */ zLifetimeText, zLifetime_NAME, zLifetime_Name,
+     /* desc, NAME, name */ LIFETIME_DESC, LIFETIME_NAME, LIFETIME_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 10, VALUE_OPT_MD5KEY,
@@ -622,11 +686,11 @@ 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 }, /* --md5key */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zMd5keyText, zMd5key_NAME, zMd5key_Name,
+     /* desc, NAME, name */ MD5KEY_DESC, MD5KEY_NAME, MD5KEY_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 11, VALUE_OPT_MODULUS,
@@ -634,11 +698,11 @@ 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 }, /* --modulus */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ doOptModulus,
-     /* desc, NAME, name */ zModulusText, zModulus_NAME, zModulus_Name,
+     /* desc, NAME, name */ MODULUS_DESC, MODULUS_NAME, MODULUS_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 12, VALUE_OPT_PVT_CERT,
@@ -646,11 +710,11 @@ 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 }, /* --pvt-cert */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zPvt_CertText, zPvt_Cert_NAME, zPvt_Cert_Name,
+     /* desc, NAME, name */ PVT_CERT_DESC, PVT_CERT_NAME, PVT_CERT_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 13, VALUE_OPT_PVT_PASSWD,
@@ -658,11 +722,11 @@ 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 }, /* --pvt-passwd */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zPvt_PasswdText, zPvt_Passwd_NAME, zPvt_Passwd_Name,
+     /* desc, NAME, name */ PVT_PASSWD_DESC, PVT_PASSWD_NAME, PVT_PASSWD_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 14, VALUE_OPT_GET_PVT_PASSWD,
@@ -670,11 +734,11 @@ 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 }, /* --get-pvt-passwd */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zGet_Pvt_PasswdText, zGet_Pvt_Passwd_NAME, zGet_Pvt_Passwd_Name,
+     /* desc, NAME, name */ GET_PVT_PASSWD_DESC, GET_PVT_PASSWD_NAME, GET_PVT_PASSWD_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 15, VALUE_OPT_SIGN_KEY,
@@ -682,11 +746,11 @@ 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 }, /* --sign-key */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zSign_KeyText, zSign_Key_NAME, zSign_Key_Name,
+     /* desc, NAME, name */ SIGN_KEY_DESC, SIGN_KEY_NAME, SIGN_KEY_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 16, VALUE_OPT_SUBJECT_NAME,
@@ -694,11 +758,11 @@ 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 }, /* --subject-name */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zSubject_NameText, zSubject_Name_NAME, zSubject_Name_Name,
+     /* desc, NAME, name */ SUBJECT_NAME_DESC, SUBJECT_NAME_NAME, SUBJECT_NAME_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 17, VALUE_OPT_TRUSTED_CERT,
@@ -706,11 +770,11 @@ 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 }, /* --trusted-cert */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ NULL,
-     /* desc, NAME, name */ zTrusted_CertText, zTrusted_Cert_NAME, zTrusted_Cert_Name,
+     /* desc, NAME, name */ TRUSTED_CERT_DESC, TRUSTED_CERT_NAME, TRUSTED_CERT_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 18, VALUE_OPT_MV_PARAMS,
@@ -718,11 +782,11 @@ 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 }, /* --mv-params */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ optionNumericVal,
-     /* desc, NAME, name */ zMv_ParamsText, zMv_Params_NAME, zMv_Params_Name,
+     /* desc, NAME, name */ MV_PARAMS_DESC, MV_PARAMS_NAME, MV_PARAMS_name,
      /* disablement strs */ NULL, NULL },
 
   {  /* entry idx, value */ 19, VALUE_OPT_MV_KEYS,
@@ -730,29 +794,29 @@ 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 }, /* --mv-keys */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
      /* option proc      */ optionNumericVal,
-     /* desc, NAME, name */ zMv_KeysText, zMv_Keys_NAME, zMv_Keys_Name,
+     /* desc, NAME, name */ MV_KEYS_DESC, MV_KEYS_NAME, MV_KEYS_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,
@@ -760,23 +824,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)
@@ -785,11 +849,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)
@@ -798,29 +862,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 Ntp_Keygen Option Environment
  */
-static char const zPROGNAME[11] = "NTP_KEYGEN";
-static char const zUsageTitle[116] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p251\n\
-USAGE:  %s [ - [] | --[{=| }] ]...\n";
-static char const zRcName[7] = ".ntprc";
+#define zPROGNAME       (ntp_keygen_opt_strs+2195)
+#define zUsageTitle     (ntp_keygen_opt_strs+2206)
+#define zRcName         (ntp_keygen_opt_strs+2322)
 static char const * const apzHomeList[3] = {
-    "$HOME",
-    ".",
+    ntp_keygen_opt_strs+2329,
+    ntp_keygen_opt_strs+2335,
     NULL };
-
-static char const zBugsAddr[34]    = "http://bugs.ntp.org, bugs@ntp.org";
-static char const zExplain[] = "\n\n";
-#define zDetail         NULL
-static char const zFullVersion[] = NTP_KEYGEN_FULL_VERSION;
-/* extracted from optcode.tlib near line 515 */
+#define zBugsAddr       (ntp_keygen_opt_strs+2337)
+#define zExplain        (ntp_keygen_opt_strs+2371)
+#define zDetail         (NULL)
+#define zFullVersion    (ntp_keygen_opt_strs+2374)
+/* extracted from optcode.tlib near line 315 */
 
 #if defined(ENABLE_NLS)
 # define OPTPROC_BASE OPTPROC_TRANSLATE
@@ -831,61 +893,9 @@ static char const zFullVersion[] = NTP_KEYGEN_FULL_VERSION;
 #endif /* ENABLE_NLS */
 
 
-#define ntp_keygen_full_usage NULL
-#define ntp_keygen_short_usage NULL
-#ifndef  PKGDATADIR
-# define PKGDATADIR ""
-#endif
-
-#ifndef  WITH_PACKAGER
-# define ntp_keygen_packager_info NULL
-#else
-static char const ntp_keygen_packager_info[] =
-    "Packaged by " WITH_PACKAGER
+#define ntp_keygen_full_usage (NULL)
 
-# ifdef WITH_PACKAGER_VERSION
-        " ("WITH_PACKAGER_VERSION")"
-# endif
-
-# ifdef WITH_PACKAGER_BUG_REPORTS
-    "\nReport ntp_keygen bugs to " WITH_PACKAGER_BUG_REPORTS
-# endif
-    "\n";
-#endif
-
-tOptions ntp_keygenOptions = {
-    OPTIONS_STRUCT_VERSION,
-    0, NULL,                    /* original argc + argv    */
-    ( OPTPROC_BASE
-    + OPTPROC_ERRSTOP
-    + OPTPROC_SHORTOPT
-    + OPTPROC_LONGOPT
-    + OPTPROC_NO_REQ_OPT
-    + OPTPROC_ENVIRON
-    + OPTPROC_NO_ARGS
-    + OPTPROC_MISUSE ),
-    0, NULL,                    /* current option index, current option */
-    NULL,         NULL,         zPROGNAME,
-    zRcName,      zCopyright,   zLicenseDescrip,
-    zFullVersion, apzHomeList,  zUsageTitle,
-    zExplain,     zDetail,      optDesc,
-    zBugsAddr,                  /* address to send bugs to */
-    NULL, NULL,                 /* extensions/saved state  */
-    optionUsage, /* usage procedure */
-    translate_option_strings,   /* translation procedure */
-    /*
-     *  Indexes to special options
-     */
-    { INDEX_OPT_MORE_HELP, /* more-help option index */
-      INDEX_OPT_SAVE_OPTS, /* save option index */
-      NO_EQUIVALENT, /* '-#' option index */
-      NO_EQUIVALENT /* index of default opt */
-    },
-    25 /* full option count */, 20 /* user option count */,
-    ntp_keygen_full_usage, ntp_keygen_short_usage,
-    NULL, NULL,
-    PKGDATADIR, ntp_keygen_packager_info
-};
+#define ntp_keygen_short_usage (NULL)
 
 /*
  *  Create the static procedure(s) declared above.
@@ -919,7 +929,7 @@ DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 static void
 doOptModulus(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    static const struct {long const rmin, rmax;} rng[1] = {
+    static struct {long rmin, rmax;} const rng[1] = {
         { 256, 2048 } };
     int  ix;
 
@@ -963,7 +973,61 @@ main(int argc, char ** argv)
     return res;
 }
 #endif  /* defined TEST_NTP_KEYGEN_OPTS */
-/* extracted from optcode.tlib near line 666 */
+/* extracted from optmain.tlib near line 1148 */
+
+#ifndef  PKGDATADIR
+# define PKGDATADIR ""
+#endif
+
+#ifndef  WITH_PACKAGER
+# define ntp_keygen_packager_info NULL
+#else
+static char const ntp_keygen_packager_info[] =
+    "Packaged by " WITH_PACKAGER
+
+# ifdef WITH_PACKAGER_VERSION
+        " ("WITH_PACKAGER_VERSION")"
+# endif
+
+# ifdef WITH_PACKAGER_BUG_REPORTS
+    "\nReport ntp_keygen bugs to " WITH_PACKAGER_BUG_REPORTS
+# endif
+    "\n";
+#endif
+
+tOptions ntp_keygenOptions = {
+    OPTIONS_STRUCT_VERSION,
+    0, NULL,                    /* original argc + argv    */
+    ( OPTPROC_BASE
+    + OPTPROC_ERRSTOP
+    + OPTPROC_SHORTOPT
+    + OPTPROC_LONGOPT
+    + OPTPROC_NO_REQ_OPT
+    + OPTPROC_ENVIRON
+    + OPTPROC_NO_ARGS
+    + OPTPROC_MISUSE ),
+    0, NULL,                    /* current option index, current option */
+    NULL,         NULL,         zPROGNAME,
+    zRcName,      zCopyright,   zLicenseDescrip,
+    zFullVersion, apzHomeList,  zUsageTitle,
+    zExplain,     zDetail,      optDesc,
+    zBugsAddr,                  /* address to send bugs to */
+    NULL, NULL,                 /* extensions/saved state  */
+    optionUsage, /* usage procedure */
+    translate_option_strings,   /* translation procedure */
+    /*
+     *  Indexes to special options
+     */
+    { INDEX_OPT_MORE_HELP, /* more-help option index */
+      INDEX_OPT_SAVE_OPTS, /* save option index */
+      NO_EQUIVALENT, /* '-#' option index */
+      NO_EQUIVALENT /* index of default opt */
+    },
+    25 /* full option count */, 20 /* user option count */,
+    ntp_keygen_full_usage, ntp_keygen_short_usage,
+    NULL, NULL,
+    PKGDATADIR, ntp_keygen_packager_info
+};
 
 #if ENABLE_NLS
 #include 
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 6e1ec78cb1..09e9ea85da 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,11 +1,11 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  January 17, 2012 at 11:34:50 AM by AutoGen 5.12
+ *  It has been AutoGen-ed  January 25, 2012 at 12:04:50 PM by AutoGen 5.14
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
- * Generated from AutoOpts 35:0:10 templates.
+ * Generated from AutoOpts 36:1: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,7 +15,8 @@
  *  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 ntp-keygen program is copyrighted and licensed
+ * under the following terms:
  *
  *  Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others, all rights reserved.
  *  This is free software. It is licensed for use, modification and
@@ -23,8 +24,8 @@
  *  can be seen at:
  *    
  *    
- *  
-PFX>Permission to use, copy, modify, and distribute this software and its
+ *
+ *  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
@@ -52,7 +53,7 @@ PFX>Permission to use, copy, modify, and distribute this software and its
  *  tolerable version is at least as old as what was current when the header
  *  template was released.
  */
-#define AO_TEMPLATE_VERSION 143360
+#define AO_TEMPLATE_VERSION 147457
 #if (AO_TEMPLATE_VERSION < OPTIONS_MINIMUM_VERSION) \
  || (AO_TEMPLATE_VERSION > OPTIONS_STRUCT_VERSION)
 # error option template version mismatches autoopts/options.h header
@@ -91,8 +92,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    25
-#define NTP_KEYGEN_VERSION       "4.2.7p251"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p251"
+#define NTP_KEYGEN_VERSION       "4.2.7p252"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p252"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -245,13 +246,11 @@ typedef enum {
 #define VALUE_OPT_IDENT          'i'
 #define VALUE_OPT_LIFETIME       'l'
 #ifdef AUTOKEY
-
 #define OPT_VALUE_LIFETIME       (DESC(LIFETIME).optArg.argInt)
 #endif /* AUTOKEY */
 #define VALUE_OPT_MD5KEY         'M'
 #define VALUE_OPT_MODULUS        'm'
 #ifdef AUTOKEY
-
 #define OPT_VALUE_MODULUS        (DESC(MODULUS).optArg.argInt)
 #endif /* AUTOKEY */
 #define VALUE_OPT_PVT_CERT       'P'
@@ -262,12 +261,10 @@ typedef enum {
 #define VALUE_OPT_TRUSTED_CERT   'T'
 #define VALUE_OPT_MV_PARAMS      'V'
 #ifdef AUTOKEY
-
 #define OPT_VALUE_MV_PARAMS      (DESC(MV_PARAMS).optArg.argInt)
 #endif /* AUTOKEY */
 #define VALUE_OPT_MV_KEYS        'v'
 #ifdef AUTOKEY
-
 #define OPT_VALUE_MV_KEYS        (DESC(MV_KEYS).optArg.argInt)
 #endif /* AUTOKEY */
 #define VALUE_OPT_HELP          '?'
@@ -289,12 +286,13 @@ typedef enum {
                 ntp_keygenOptions.pzCurOpt  = NULL)
 #define START_OPT       RESTART_OPT(1)
 #define USAGE(c)        (*ntp_keygenOptions.pUsageProc)(&ntp_keygenOptions, c)
-/* extracted from opthead.tlib near line 451 */
+/* extracted from opthead.tlib near line 469 */
 
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
+
 /* * * * * *
  *
  *  Declare the ntp-keygen option descriptor.
diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index 267aa3419c..e013ca690a 100644
--- a/util/ntp-keygen-opts.texi
+++ b/util/ntp-keygen-opts.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  January 17, 2012 at 11:35:06 AM by AutoGen 5.12
+# It has been AutoGen-ed  January 25, 2012 at 12:05:07 PM by AutoGen 5.14
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -44,13 +44,13 @@ This software is released under a specialized copyright license.
 
 @node ntp-keygen usage
 @subsection ntp-keygen usage help (-?)
-@cindex ntp-keygen usage
+@cindex ntp-keygen-usage
 
 This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p251
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p252
 USAGE:  ntp-keygen [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index ac6f35a56b..358b0afd57 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "17 Jan 2012" "ntp (4.2.7p251)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "25 Jan 2012" "ntp (4.2.7p252)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:35:03 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:03 PM by AutoGen 5.14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index a0415fc782..f5faa41252 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd January 17 2012
+.Dd January 25 2012
 .Dt NTP_KEYGEN 1ntp-keygenmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:35:07 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:07 PM by AutoGen 5.14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index a1a3075c49..4a7e355242 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "17 Jan 2012" "ntp (4.2.7p251)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "25 Jan 2012" "ntp (4.2.7p252)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:35:03 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:03 PM by AutoGen 5.14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index 9fa0e7bad0..b67a89793e 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 17 2012
+.Dd January 25 2012
 .Dt NTP_KEYGEN @NTP_KEYGEN_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 17, 2012 at 11:35:07 AM by AutoGen 5.12
+.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:07 PM by AutoGen 5.14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME