From: Harlan Stenn Date: Thu, 26 Jan 2012 06:05:07 +0000 (+0000) Subject: NTP_4_2_7P253 X-Git-Tag: NTP_4_2_7P253^0 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e6f1088c74a3528fc32503b548ae96e3fcd29fcd;p=thirdparty%2Fntp.git NTP_4_2_7P253 bk: 4f20ed13aT1F_ruw-BY8wGHi34jvLA --- diff --git a/ChangeLog b/ChangeLog index 5584ddd23..b73a5dee5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,4 @@ +(4.2.7p253) 2012/01/26 Released by Harlan Stenn * [Bug 2126] Compile error on Windows with libopts from Autogen 5.14. * Update one of the license URLs. (4.2.7p252) 2012/01/25 Released by Harlan Stenn diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c index 675eca3e1..076ac9e0e 100644 --- a/ntpd/ntpd-opts.c +++ b/ntpd/ntpd-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.c) * - * It has been AutoGen-ed January 25, 2012 at 12:02:00 PM by AutoGen 5.14 + * It has been AutoGen-ed January 26, 2012 at 06:03:34 AM by AutoGen 5.14 * From the definitions ntpd-opts.def * and the template file options * @@ -18,20 +18,20 @@ * 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. + * Copyright (C) 1970-2012 The University of Delaware, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: * - * + * * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose with or without fee is hereby granted, * provided that the above copyright notice appears in all copies and that * both the copyright notice and this permission notice appear in - * supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in + * supporting documentation, and that the name The University of Delaware not be used in * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no + * without specific, written prior permission. The University of Delaware makes no * representations about the suitability this software for any purpose. It * is provided "as is" without express or implied warranty. */ @@ -52,7 +52,7 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ #define zCopyright (ntpd_opt_strs+0) -#define zLicenseDescrip (ntpd_opt_strs+333) +#define zLicenseDescrip (ntpd_opt_strs+314) extern tUsageProc optionUsage; /* @@ -70,146 +70,145 @@ extern tUsageProc optionUsage; /* * 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" +static char const ntpd_opt_strs[3008] = +/* 0 */ "ntpd 4.2.7p253\n" + "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" "can be seen at:\n" " \n" - " \n\0" -/* 333 */ "Permission to use, copy, modify, and distribute this software and its\n" + " \n\0" +/* 314 */ "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" + "documentation, and that the name The University of Delaware not be used in\n" + "advertising or publicity pertaining to distribution of the software\n" + "without specific, written prior permission. The University of Delaware\n" + "makes no representations about the suitability this software for any\n" + "purpose. It is provided \"as is\" without express or implied warranty.\n\0" +/* 952 */ "Force IPv4 DNS name resolution\0" +/* 983 */ "IPV4\0" +/* 988 */ "ipv4\0" +/* 993 */ "Force IPv6 DNS name resolution\0" +/* 1024 */ "IPV6\0" +/* 1029 */ "ipv6\0" +/* 1034 */ "Require crypto authentication\0" +/* 1064 */ "AUTHREQ\0" +/* 1072 */ "authreq\0" +/* 1080 */ "Do not require crypto authentication\0" +/* 1117 */ "AUTHNOREQ\0" +/* 1127 */ "authnoreq\0" +/* 1137 */ "Allow us to sync to broadcast servers\0" +/* 1175 */ "BCASTSYNC\0" +/* 1185 */ "bcastsync\0" +/* 1195 */ "configuration file name\0" +/* 1219 */ "CONFIGFILE\0" +/* 1230 */ "configfile\0" +/* 1241 */ "Increase output debug message level\0" +/* 1277 */ "DEBUG_LEVEL\0" +/* 1289 */ "debug-level\0" +/* 1301 */ "this package was built using 'configure --disable--debug'\0" +/* 1359 */ "Set the output debug message level\0" +/* 1394 */ "SET_DEBUG_LEVEL\0" +/* 1410 */ "set-debug-level\0" +/* 1426 */ "frequency drift file name\0" +/* 1452 */ "DRIFTFILE\0" +/* 1462 */ "driftfile\0" +/* 1472 */ "Allow the first adjustment to be Big\0" +/* 1509 */ "PANICGATE\0" +/* 1519 */ "panicgate\0" +/* 1529 */ "Jail directory\0" +/* 1544 */ "JAILDIR\0" +/* 1552 */ "jaildir\0" +/* 1560 */ "built without --enable-clockctl or --enable-linuxcaps\0" +/* 1614 */ "Listen on an interface name or address\0" +/* 1653 */ "INTERFACE\0" +/* 1663 */ "interface\0" +/* 1673 */ "path to symmetric keys\0" +/* 1696 */ "KEYFILE\0" +/* 1704 */ "keyfile\0" +/* 1712 */ "path to the log file\0" +/* 1733 */ "LOGFILE\0" +/* 1741 */ "logfile\0" +/* 1749 */ "Do not listen to virtual interfaces\0" +/* 1785 */ "NOVIRTUALIPS\0" +/* 1798 */ "novirtualips\0" +/* 1811 */ "Modify Multimedia Timer (Windows only)\0" +/* 1850 */ "MODIFYMMTIMER\0" +/* 1864 */ "modifymmtimer\0" +/* 1878 */ "Do not fork\0" +/* 1890 */ "NOFORK\0" +/* 1897 */ "nofork\0" +/* 1904 */ "Run at high priority\0" +/* 1925 */ "NICE\0" +/* 1930 */ "nice\0" +/* 1935 */ "path to the PID file\0" +/* 1956 */ "PIDFILE\0" +/* 1964 */ "pidfile\0" +/* 1972 */ "Process priority\0" +/* 1989 */ "PRIORITY\0" +/* 1998 */ "priority\0" +/* 2007 */ "Set the time and quit\0" +/* 2029 */ "QUIT\0" +/* 2034 */ "quit\0" +/* 2039 */ "Broadcast/propagation delay\0" +/* 2067 */ "PROPAGATIONDELAY\0" +/* 2084 */ "propagationdelay\0" +/* 2101 */ "Save parsed configuration and quit\0" +/* 2136 */ "SAVECONFIGQUIT\0" +/* 2151 */ "saveconfigquit\0" +/* 2166 */ "Statistics file location\0" +/* 2191 */ "STATSDIR\0" +/* 2200 */ "statsdir\0" +/* 2209 */ "Trusted key number\0" +/* 2228 */ "TRUSTEDKEY\0" +/* 2239 */ "trustedkey\0" +/* 2250 */ "Run as userid (or userid:groupid)\0" +/* 2284 */ "USER\0" +/* 2289 */ "user\0" +/* 2294 */ "interval in seconds between scans for new or dropped interfaces\0" +/* 2358 */ "UPDATEINTERVAL\0" +/* 2373 */ "updateinterval\0" +/* 2388 */ "make ARG an ntp variable (RW)\0" +/* 2418 */ "VAR\0" +/* 2422 */ "var\0" +/* 2426 */ "make ARG an ntp variable (RW|DEF)\0" +/* 2460 */ "DVAR\0" +/* 2465 */ "dvar\0" +/* 2470 */ "Seconds to wait for first clock sync\0" +/* 2507 */ "WAIT_SYNC\0" +/* 2517 */ "wait-sync\0" +/* 2527 */ "Slew up to 600 seconds\0" +/* 2550 */ "SLEW\0" +/* 2555 */ "slew\0" +/* 2560 */ "Use CPU cycle counter (Windows only)\0" +/* 2597 */ "USEPCC\0" +/* 2604 */ "usepcc\0" +/* 2611 */ "Force CPU cycle counter use (Windows only)\0" +/* 2654 */ "PCCFREQ\0" +/* 2662 */ "pccfreq\0" +/* 2670 */ "Display extended usage information and exit\0" +/* 2714 */ "help\0" +/* 2719 */ "Extended usage information passed thru pager\0" +/* 2764 */ "more-help\0" +/* 2774 */ "Output version information and exit\0" +/* 2810 */ "version\0" +/* 2818 */ "NTPD\0" +/* 2823 */ "ntpd - NTP daemon program - Ver. 4.2.7p253\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"; +/* 2956 */ "http://bugs.ntp.org, bugs@ntp.org\0" +/* 2990 */ "\n\n\0" +/* 2993 */ "ntpd 4.2.7p253"; /* * ipv4 option description with * "Must also have options" and "Incompatible options": */ -#define IPV4_DESC (ntpd_opt_strs+1033) -#define IPV4_NAME (ntpd_opt_strs+1064) -#define IPV4_name (ntpd_opt_strs+1069) +#define IPV4_DESC (ntpd_opt_strs+952) +#define IPV4_NAME (ntpd_opt_strs+983) +#define IPV4_name (ntpd_opt_strs+988) static int const aIpv4CantList[] = { INDEX_OPT_IPV6, NO_EQUIVALENT }; #define IPV4_FLAGS (OPTST_DISABLED) @@ -218,9 +217,9 @@ static int const aIpv4CantList[] = { * ipv6 option description with * "Must also have options" and "Incompatible options": */ -#define IPV6_DESC (ntpd_opt_strs+1074) -#define IPV6_NAME (ntpd_opt_strs+1105) -#define IPV6_name (ntpd_opt_strs+1110) +#define IPV6_DESC (ntpd_opt_strs+993) +#define IPV6_NAME (ntpd_opt_strs+1024) +#define IPV6_name (ntpd_opt_strs+1029) static int const aIpv6CantList[] = { INDEX_OPT_IPV4, NO_EQUIVALENT }; #define IPV6_FLAGS (OPTST_DISABLED) @@ -229,9 +228,9 @@ static int const aIpv6CantList[] = { * authreq option description with * "Must also have options" and "Incompatible options": */ -#define AUTHREQ_DESC (ntpd_opt_strs+1115) -#define AUTHREQ_NAME (ntpd_opt_strs+1145) -#define AUTHREQ_name (ntpd_opt_strs+1153) +#define AUTHREQ_DESC (ntpd_opt_strs+1034) +#define AUTHREQ_NAME (ntpd_opt_strs+1064) +#define AUTHREQ_name (ntpd_opt_strs+1072) static int const aAuthreqCantList[] = { INDEX_OPT_AUTHNOREQ, NO_EQUIVALENT }; #define AUTHREQ_FLAGS (OPTST_DISABLED) @@ -240,9 +239,9 @@ static int const aAuthreqCantList[] = { * authnoreq option description with * "Must also have options" and "Incompatible options": */ -#define AUTHNOREQ_DESC (ntpd_opt_strs+1161) -#define AUTHNOREQ_NAME (ntpd_opt_strs+1198) -#define AUTHNOREQ_name (ntpd_opt_strs+1208) +#define AUTHNOREQ_DESC (ntpd_opt_strs+1080) +#define AUTHNOREQ_NAME (ntpd_opt_strs+1117) +#define AUTHNOREQ_name (ntpd_opt_strs+1127) static int const aAuthnoreqCantList[] = { INDEX_OPT_AUTHREQ, NO_EQUIVALENT }; #define AUTHNOREQ_FLAGS (OPTST_DISABLED) @@ -250,17 +249,17 @@ static int const aAuthnoreqCantList[] = { /* * bcastsync option description: */ -#define BCASTSYNC_DESC (ntpd_opt_strs+1218) -#define BCASTSYNC_NAME (ntpd_opt_strs+1256) -#define BCASTSYNC_name (ntpd_opt_strs+1266) +#define BCASTSYNC_DESC (ntpd_opt_strs+1137) +#define BCASTSYNC_NAME (ntpd_opt_strs+1175) +#define BCASTSYNC_name (ntpd_opt_strs+1185) #define BCASTSYNC_FLAGS (OPTST_DISABLED) /* * configfile option description: */ -#define CONFIGFILE_DESC (ntpd_opt_strs+1276) -#define CONFIGFILE_NAME (ntpd_opt_strs+1300) -#define CONFIGFILE_name (ntpd_opt_strs+1311) +#define CONFIGFILE_DESC (ntpd_opt_strs+1195) +#define CONFIGFILE_NAME (ntpd_opt_strs+1219) +#define CONFIGFILE_name (ntpd_opt_strs+1230) #define CONFIGFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -268,111 +267,111 @@ static int const aAuthnoreqCantList[] = { * debug-level option description: */ #ifdef 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_DESC (ntpd_opt_strs+1241) +#define DEBUG_LEVEL_NAME (ntpd_opt_strs+1277) +#define DEBUG_LEVEL_name (ntpd_opt_strs+1289) #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) +#define DEBUG_LEVEL_DESC (ntpd_opt_strs+1301) +#define DEBUG_LEVEL_name (ntpd_opt_strs+1289) #endif /* DEBUG */ /* * set-debug-level option description: */ #ifdef DEBUG -#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_DESC (ntpd_opt_strs+1359) +#define SET_DEBUG_LEVEL_NAME (ntpd_opt_strs+1394) +#define SET_DEBUG_LEVEL_name (ntpd_opt_strs+1410) #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 SET_DEBUG_LEVEL_NAME NULL -#define SET_DEBUG_LEVEL_DESC (ntpd_opt_strs+1382) -#define SET_DEBUG_LEVEL_name (ntpd_opt_strs+1491) +#define SET_DEBUG_LEVEL_DESC (ntpd_opt_strs+1301) +#define SET_DEBUG_LEVEL_name (ntpd_opt_strs+1410) #endif /* DEBUG */ /* * driftfile option description: */ -#define DRIFTFILE_DESC (ntpd_opt_strs+1507) -#define DRIFTFILE_NAME (ntpd_opt_strs+1533) -#define DRIFTFILE_name (ntpd_opt_strs+1543) +#define DRIFTFILE_DESC (ntpd_opt_strs+1426) +#define DRIFTFILE_NAME (ntpd_opt_strs+1452) +#define DRIFTFILE_name (ntpd_opt_strs+1462) #define DRIFTFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * panicgate option description: */ -#define PANICGATE_DESC (ntpd_opt_strs+1553) -#define PANICGATE_NAME (ntpd_opt_strs+1590) -#define PANICGATE_name (ntpd_opt_strs+1600) +#define PANICGATE_DESC (ntpd_opt_strs+1472) +#define PANICGATE_NAME (ntpd_opt_strs+1509) +#define PANICGATE_name (ntpd_opt_strs+1519) #define PANICGATE_FLAGS (OPTST_DISABLED) /* * jaildir option description: */ #ifdef HAVE_DROPROOT -#define JAILDIR_DESC (ntpd_opt_strs+1610) -#define JAILDIR_NAME (ntpd_opt_strs+1625) -#define JAILDIR_name (ntpd_opt_strs+1633) +#define JAILDIR_DESC (ntpd_opt_strs+1529) +#define JAILDIR_NAME (ntpd_opt_strs+1544) +#define JAILDIR_name (ntpd_opt_strs+1552) #define JAILDIR_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #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) +#define JAILDIR_DESC (ntpd_opt_strs+1560) +#define JAILDIR_name (ntpd_opt_strs+1552) #endif /* HAVE_DROPROOT */ /* * interface option description: */ -#define INTERFACE_DESC (ntpd_opt_strs+1695) -#define INTERFACE_NAME (ntpd_opt_strs+1734) -#define INTERFACE_name (ntpd_opt_strs+1744) +#define INTERFACE_DESC (ntpd_opt_strs+1614) +#define INTERFACE_NAME (ntpd_opt_strs+1653) +#define INTERFACE_name (ntpd_opt_strs+1663) #define INTERFACE_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * keyfile option description: */ -#define KEYFILE_DESC (ntpd_opt_strs+1754) -#define KEYFILE_NAME (ntpd_opt_strs+1777) -#define KEYFILE_name (ntpd_opt_strs+1785) +#define KEYFILE_DESC (ntpd_opt_strs+1673) +#define KEYFILE_NAME (ntpd_opt_strs+1696) +#define KEYFILE_name (ntpd_opt_strs+1704) #define KEYFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * logfile option description: */ -#define LOGFILE_DESC (ntpd_opt_strs+1793) -#define LOGFILE_NAME (ntpd_opt_strs+1814) -#define LOGFILE_name (ntpd_opt_strs+1822) +#define LOGFILE_DESC (ntpd_opt_strs+1712) +#define LOGFILE_NAME (ntpd_opt_strs+1733) +#define LOGFILE_name (ntpd_opt_strs+1741) #define LOGFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * novirtualips option description: */ -#define NOVIRTUALIPS_DESC (ntpd_opt_strs+1830) -#define NOVIRTUALIPS_NAME (ntpd_opt_strs+1866) -#define NOVIRTUALIPS_name (ntpd_opt_strs+1879) +#define NOVIRTUALIPS_DESC (ntpd_opt_strs+1749) +#define NOVIRTUALIPS_NAME (ntpd_opt_strs+1785) +#define NOVIRTUALIPS_name (ntpd_opt_strs+1798) #define NOVIRTUALIPS_FLAGS (OPTST_DISABLED) /* * modifymmtimer option description: */ #ifdef SYS_WINNT -#define MODIFYMMTIMER_DESC (ntpd_opt_strs+1892) -#define MODIFYMMTIMER_NAME (ntpd_opt_strs+1931) -#define MODIFYMMTIMER_name (ntpd_opt_strs+1945) +#define MODIFYMMTIMER_DESC (ntpd_opt_strs+1811) +#define MODIFYMMTIMER_NAME (ntpd_opt_strs+1850) +#define MODIFYMMTIMER_name (ntpd_opt_strs+1864) #define MODIFYMMTIMER_FLAGS (OPTST_DISABLED) #else /* disable modifymmtimer */ @@ -386,9 +385,9 @@ static int const aAuthnoreqCantList[] = { * nofork option description with * "Must also have options" and "Incompatible options": */ -#define NOFORK_DESC (ntpd_opt_strs+1959) -#define NOFORK_NAME (ntpd_opt_strs+1971) -#define NOFORK_name (ntpd_opt_strs+1978) +#define NOFORK_DESC (ntpd_opt_strs+1878) +#define NOFORK_NAME (ntpd_opt_strs+1890) +#define NOFORK_name (ntpd_opt_strs+1897) static int const aNoforkCantList[] = { INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; #define NOFORK_FLAGS (OPTST_DISABLED) @@ -396,26 +395,26 @@ static int const aNoforkCantList[] = { /* * nice option description: */ -#define NICE_DESC (ntpd_opt_strs+1985) -#define NICE_NAME (ntpd_opt_strs+2006) -#define NICE_name (ntpd_opt_strs+2011) +#define NICE_DESC (ntpd_opt_strs+1904) +#define NICE_NAME (ntpd_opt_strs+1925) +#define NICE_name (ntpd_opt_strs+1930) #define NICE_FLAGS (OPTST_DISABLED) /* * pidfile option description: */ -#define PIDFILE_DESC (ntpd_opt_strs+2016) -#define PIDFILE_NAME (ntpd_opt_strs+2037) -#define PIDFILE_name (ntpd_opt_strs+2045) +#define PIDFILE_DESC (ntpd_opt_strs+1935) +#define PIDFILE_NAME (ntpd_opt_strs+1956) +#define PIDFILE_name (ntpd_opt_strs+1964) #define PIDFILE_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * priority option description: */ -#define PRIORITY_DESC (ntpd_opt_strs+2053) -#define PRIORITY_NAME (ntpd_opt_strs+2070) -#define PRIORITY_name (ntpd_opt_strs+2079) +#define PRIORITY_DESC (ntpd_opt_strs+1972) +#define PRIORITY_NAME (ntpd_opt_strs+1989) +#define PRIORITY_name (ntpd_opt_strs+1998) #define PRIORITY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) @@ -423,9 +422,9 @@ static int const aNoforkCantList[] = { * quit option description with * "Must also have options" and "Incompatible options": */ -#define QUIT_DESC (ntpd_opt_strs+2088) -#define QUIT_NAME (ntpd_opt_strs+2110) -#define QUIT_name (ntpd_opt_strs+2115) +#define QUIT_DESC (ntpd_opt_strs+2007) +#define QUIT_NAME (ntpd_opt_strs+2029) +#define QUIT_name (ntpd_opt_strs+2034) static int const aQuitCantList[] = { INDEX_OPT_SAVECONFIGQUIT, INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; @@ -434,9 +433,9 @@ static int const aQuitCantList[] = { /* * propagationdelay option description: */ -#define PROPAGATIONDELAY_DESC (ntpd_opt_strs+2120) -#define PROPAGATIONDELAY_NAME (ntpd_opt_strs+2148) -#define PROPAGATIONDELAY_name (ntpd_opt_strs+2165) +#define PROPAGATIONDELAY_DESC (ntpd_opt_strs+2039) +#define PROPAGATIONDELAY_NAME (ntpd_opt_strs+2067) +#define PROPAGATIONDELAY_name (ntpd_opt_strs+2084) #define PROPAGATIONDELAY_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -445,9 +444,9 @@ static int const aQuitCantList[] = { * "Must also have options" and "Incompatible options": */ #ifdef SAVECONFIG -#define SAVECONFIGQUIT_DESC (ntpd_opt_strs+2182) -#define SAVECONFIGQUIT_NAME (ntpd_opt_strs+2217) -#define SAVECONFIGQUIT_name (ntpd_opt_strs+2232) +#define SAVECONFIGQUIT_DESC (ntpd_opt_strs+2101) +#define SAVECONFIGQUIT_NAME (ntpd_opt_strs+2136) +#define SAVECONFIGQUIT_name (ntpd_opt_strs+2151) static int const aSaveconfigquitCantList[] = { INDEX_OPT_QUIT, INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT }; @@ -465,18 +464,18 @@ static int const aSaveconfigquitCantList[] = { /* * statsdir option description: */ -#define STATSDIR_DESC (ntpd_opt_strs+2247) -#define STATSDIR_NAME (ntpd_opt_strs+2272) -#define STATSDIR_name (ntpd_opt_strs+2281) +#define STATSDIR_DESC (ntpd_opt_strs+2166) +#define STATSDIR_NAME (ntpd_opt_strs+2191) +#define STATSDIR_name (ntpd_opt_strs+2200) #define STATSDIR_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * trustedkey option description: */ -#define TRUSTEDKEY_DESC (ntpd_opt_strs+2290) -#define TRUSTEDKEY_NAME (ntpd_opt_strs+2309) -#define TRUSTEDKEY_name (ntpd_opt_strs+2320) +#define TRUSTEDKEY_DESC (ntpd_opt_strs+2209) +#define TRUSTEDKEY_NAME (ntpd_opt_strs+2228) +#define TRUSTEDKEY_name (ntpd_opt_strs+2239) #define TRUSTEDKEY_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -484,43 +483,43 @@ static int const aSaveconfigquitCantList[] = { * user option description: */ #ifdef HAVE_DROPROOT -#define USER_DESC (ntpd_opt_strs+2331) -#define USER_NAME (ntpd_opt_strs+2365) -#define USER_name (ntpd_opt_strs+2370) +#define USER_DESC (ntpd_opt_strs+2250) +#define USER_NAME (ntpd_opt_strs+2284) +#define USER_name (ntpd_opt_strs+2289) #define USER_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) #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) +#define USER_DESC (ntpd_opt_strs+1560) +#define USER_name (ntpd_opt_strs+2289) #endif /* HAVE_DROPROOT */ /* * updateinterval option description: */ -#define UPDATEINTERVAL_DESC (ntpd_opt_strs+2375) -#define UPDATEINTERVAL_NAME (ntpd_opt_strs+2439) -#define UPDATEINTERVAL_name (ntpd_opt_strs+2454) +#define UPDATEINTERVAL_DESC (ntpd_opt_strs+2294) +#define UPDATEINTERVAL_NAME (ntpd_opt_strs+2358) +#define UPDATEINTERVAL_name (ntpd_opt_strs+2373) #define UPDATEINTERVAL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC)) /* * var option description: */ -#define VAR_DESC (ntpd_opt_strs+2469) -#define VAR_NAME (ntpd_opt_strs+2499) -#define VAR_name (ntpd_opt_strs+2503) +#define VAR_DESC (ntpd_opt_strs+2388) +#define VAR_NAME (ntpd_opt_strs+2418) +#define VAR_name (ntpd_opt_strs+2422) #define VAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * dvar option description: */ -#define DVAR_DESC (ntpd_opt_strs+2507) -#define DVAR_NAME (ntpd_opt_strs+2541) -#define DVAR_name (ntpd_opt_strs+2546) +#define DVAR_DESC (ntpd_opt_strs+2426) +#define DVAR_NAME (ntpd_opt_strs+2460) +#define DVAR_name (ntpd_opt_strs+2465) #define DVAR_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -529,9 +528,9 @@ static int const aSaveconfigquitCantList[] = { * "Must also have options" and "Incompatible options": */ #ifdef HAVE_WORKING_FORK -#define WAIT_SYNC_DESC (ntpd_opt_strs+2551) -#define WAIT_SYNC_NAME (ntpd_opt_strs+2588) -#define WAIT_SYNC_name (ntpd_opt_strs+2598) +#define WAIT_SYNC_DESC (ntpd_opt_strs+2470) +#define WAIT_SYNC_NAME (ntpd_opt_strs+2507) +#define WAIT_SYNC_name (ntpd_opt_strs+2517) static int const aWait_SyncCantList[] = { INDEX_OPT_NOFORK, INDEX_OPT_QUIT, @@ -550,18 +549,18 @@ static int const aWait_SyncCantList[] = { /* * slew option description: */ -#define SLEW_DESC (ntpd_opt_strs+2608) -#define SLEW_NAME (ntpd_opt_strs+2631) -#define SLEW_name (ntpd_opt_strs+2636) +#define SLEW_DESC (ntpd_opt_strs+2527) +#define SLEW_NAME (ntpd_opt_strs+2550) +#define SLEW_name (ntpd_opt_strs+2555) #define SLEW_FLAGS (OPTST_DISABLED) /* * usepcc option description: */ #ifdef SYS_WINNT -#define USEPCC_DESC (ntpd_opt_strs+2641) -#define USEPCC_NAME (ntpd_opt_strs+2678) -#define USEPCC_name (ntpd_opt_strs+2685) +#define USEPCC_DESC (ntpd_opt_strs+2560) +#define USEPCC_NAME (ntpd_opt_strs+2597) +#define USEPCC_name (ntpd_opt_strs+2604) #define USEPCC_FLAGS (OPTST_DISABLED) #else /* disable usepcc */ @@ -575,9 +574,9 @@ static int const aWait_SyncCantList[] = { * pccfreq option description: */ #ifdef SYS_WINNT -#define PCCFREQ_DESC (ntpd_opt_strs+2692) -#define PCCFREQ_NAME (ntpd_opt_strs+2735) -#define PCCFREQ_name (ntpd_opt_strs+2743) +#define PCCFREQ_DESC (ntpd_opt_strs+2611) +#define PCCFREQ_NAME (ntpd_opt_strs+2654) +#define PCCFREQ_name (ntpd_opt_strs+2662) #define PCCFREQ_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -591,11 +590,11 @@ static int const aWait_SyncCantList[] = { /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (ntpd_opt_strs+2751) -#define HELP_name (ntpd_opt_strs+2795) +#define HELP_DESC (ntpd_opt_strs+2670) +#define HELP_name (ntpd_opt_strs+2714) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (ntpd_opt_strs+2800) -#define MORE_HELP_name (ntpd_opt_strs+2845) +#define MORE_HELP_DESC (ntpd_opt_strs+2719) +#define MORE_HELP_name (ntpd_opt_strs+2764) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC NULL @@ -608,8 +607,8 @@ static int const aWait_SyncCantList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#define VER_DESC (ntpd_opt_strs+2855) -#define VER_name (ntpd_opt_strs+2891) +#define VER_DESC (ntpd_opt_strs+2774) +#define VER_name (ntpd_opt_strs+2810) /* * Declare option callback procedures */ @@ -637,10 +636,10 @@ static tOptProc * When not under test, there are different procs to use */ extern tOptProc - optionBooleanVal, optionNestedVal, optionNumericVal, - optionPagedUsage, optionPrintVersion, optionResetOpt, - optionStackArg, optionTimeDate, optionTimeVal, - optionUnstackArg, optionVendorOption, optionVersionStderr; + ntpOptionPrintVersion, optionBooleanVal, optionNestedVal, + optionNumericVal, optionPagedUsage, optionResetOpt, + optionStackArg, optionTimeDate, optionTimeVal, + optionUnstackArg, optionVendorOption, optionVersionStderr; static tOptProc doUsageOpt; @@ -651,11 +650,7 @@ static tOptProc #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level #endif /* defined(TEST_NTPD_OPTS) */ -#ifdef TEST_NTPD_OPTS -# define VER_PROC optionVersionStderr -#else -# define VER_PROC optionPrintVersion -#endif /* TEST_NTPD_OPTS */ +#define VER_PROC ntpOptionPrintVersion /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -1102,14 +1097,14 @@ static tOptDesc optDesc[OPTION_CT] = { * * Define the Ntpd Option Environment */ -#define zPROGNAME (ntpd_opt_strs+2899) -#define zUsageTitle (ntpd_opt_strs+2904) +#define zPROGNAME (ntpd_opt_strs+2818) +#define zUsageTitle (ntpd_opt_strs+2823) #define zRcName NULL #define apzHomeList NULL -#define zBugsAddr (ntpd_opt_strs+3037) -#define zExplain (ntpd_opt_strs+3071) +#define zBugsAddr (ntpd_opt_strs+2956) +#define zExplain (ntpd_opt_strs+2990) #define zDetail (NULL) -#define zFullVersion (ntpd_opt_strs+3074) +#define zFullVersion (ntpd_opt_strs+2993) /* extracted from optcode.tlib near line 315 */ #if defined(ENABLE_NLS) diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h index 9932236ff..4b6ca79e8 100644 --- a/ntpd/ntpd-opts.h +++ b/ntpd/ntpd-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpd-opts.h) * - * It has been AutoGen-ed January 25, 2012 at 12:02:00 PM by AutoGen 5.14 + * It has been AutoGen-ed January 26, 2012 at 06:03:34 AM by AutoGen 5.14 * From the definitions ntpd-opts.def * and the template file options * @@ -18,20 +18,20 @@ * 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. + * Copyright (C) 1970-2012 The University of Delaware, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: * - * + * * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose with or without fee is hereby granted, * provided that the above copyright notice appears in all copies and that * both the copyright notice and this permission notice appear in - * supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in + * supporting documentation, and that the name The University of Delaware not be used in * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no + * without specific, written prior permission. The University of Delaware makes no * representations about the suitability this software for any purpose. It * is provided "as is" without express or implied warranty. */ @@ -103,8 +103,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 36 -#define NTPD_VERSION "4.2.7p252" -#define NTPD_FULL_VERSION "ntpd 4.2.7p252" +#define NTPD_VERSION "4.2.7p253" +#define NTPD_FULL_VERSION "ntpd 4.2.7p253" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi index b5e6434c2..b961e75d1 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 25, 2012 at 12:03:54 PM by AutoGen 5.14 +# It has been AutoGen-ed January 26, 2012 at 06:03:45 AM by AutoGen 5.14 # From the definitions ntpd-opts.def # and the template file aginfo.tpl @end ignore @@ -63,7 +63,7 @@ This is the automatically generated usage text for ntpd: @exampleindent 0 @example -ntpd - NTP daemon program - Ver. 4.2.7p252 +ntpd - NTP daemon program - Ver. 4.2.7p253 USAGE: ntpd [ - [] | --[@{=| @}] ]... \ [ ... ] Flg Arg Option-Name Description diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman index 2a75620c5..d7245c548 100644 --- a/ntpd/ntpd.1ntpdman +++ b/ntpd/ntpd.1ntpdman @@ -1,8 +1,8 @@ -.TH ntpd 1ntpdman "25 Jan 2012" "4.2.7p252" "User Commands" +.TH ntpd 1ntpdman "26 Jan 2012" "4.2.7p253" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed January 25, 2012 at 12:03:51 PM by AutoGen 5.14 +.\" It has been AutoGen-ed January 26, 2012 at 06:03:42 AM by AutoGen 5.14 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" @@ -887,9 +887,9 @@ A snapshot of this documentation is available in HTML format in .%O RFC5908 .Re .SH "AUTHORS" -The University of Delaware, David L. Mills, and/or others +The University of Delaware .SH "COPYRIGHT" -Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved. +Copyright (C) 1970-2012 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .SH BUGS The diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc index 2576132c2..1031bd497 100644 --- a/ntpd/ntpd.1ntpdmdoc +++ b/ntpd/ntpd.1ntpdmdoc @@ -1,9 +1,9 @@ -.Dd January 25 2012 +.Dd January 26 2012 .Dt NTPD 1ntpdmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.mdoc) .\" -.\" It has been AutoGen-ed January 25, 2012 at 12:03:55 PM by AutoGen 5.14 +.\" It has been AutoGen-ed January 26, 2012 at 06:03:46 AM by AutoGen 5.14 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -856,9 +856,9 @@ A snapshot of this documentation is available in HTML format in .%O RFC5908 .Re .Sh "AUTHORS" -The University of Delaware, David L. Mills, and/or others +The University of Delaware .Sh "COPYRIGHT" -Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved. +Copyright (C) 1970-2012 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS The diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in index 6256f8d9a..4164266f2 100644 --- a/ntpd/ntpd.man.in +++ b/ntpd/ntpd.man.in @@ -1,8 +1,8 @@ -.TH ntpd @NTPD_MS@ "25 Jan 2012" "4.2.7p252" "User Commands" +.TH ntpd @NTPD_MS@ "26 Jan 2012" "4.2.7p253" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpd-opts.man) .\" -.\" It has been AutoGen-ed January 25, 2012 at 12:03:51 PM by AutoGen 5.14 +.\" It has been AutoGen-ed January 26, 2012 at 06:03:42 AM by AutoGen 5.14 .\" From the definitions ntpd-opts.def .\" and the template file agman-cmd.tpl .\" @@ -887,9 +887,9 @@ A snapshot of this documentation is available in HTML format in .%O RFC5908 .Re .SH "AUTHORS" -The University of Delaware, David L. Mills, and/or others +The University of Delaware .SH "COPYRIGHT" -Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved. +Copyright (C) 1970-2012 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .SH BUGS The diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in index 99a8e194f..dc5641d7a 100644 --- a/ntpd/ntpd.mdoc.in +++ b/ntpd/ntpd.mdoc.in @@ -1,9 +1,9 @@ -.Dd January 25 2012 +.Dd January 26 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 25, 2012 at 12:03:55 PM by AutoGen 5.14 +.\" It has been AutoGen-ed January 26, 2012 at 06:03:46 AM by AutoGen 5.14 .\" From the definitions ntpd-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -856,9 +856,9 @@ A snapshot of this documentation is available in HTML format in .%O RFC5908 .Re .Sh "AUTHORS" -The University of Delaware, David L. Mills, and/or others +The University of Delaware .Sh "COPYRIGHT" -Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved. +Copyright (C) 1970-2012 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS The diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c index bb934df08..d9f142a5c 100644 --- a/ntpdc/ntpdc-opts.c +++ b/ntpdc/ntpdc-opts.c @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.c) * - * It has been AutoGen-ed January 25, 2012 at 12:04:02 PM by AutoGen 5.14 + * It has been AutoGen-ed January 26, 2012 at 06:03:49 AM by AutoGen 5.14 * From the definitions ntpdc-opts.def * and the template file options * @@ -18,20 +18,20 @@ * 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. + * Copyright (C) 1970-2012 The University of Delaware, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: * - * + * * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose with or without fee is hereby granted, * provided that the above copyright notice appears in all copies and that * both the copyright notice and this permission notice appear in - * supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in + * supporting documentation, and that the name The University of Delaware not be used in * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no + * without specific, written prior permission. The University of Delaware makes no * representations about the suitability this software for any purpose. It * is provided "as is" without express or implied warranty. */ @@ -52,7 +52,7 @@ extern FILE * option_usage_fp; /* TRANSLATORS: choose the translation for option names wisely because you cannot ever change your mind. */ #define zCopyright (ntpdc_opt_strs+0) -#define zLicenseDescrip (ntpdc_opt_strs+334) +#define zLicenseDescrip (ntpdc_opt_strs+315) extern tUsageProc optionUsage; /* @@ -70,82 +70,81 @@ extern tUsageProc optionUsage; /* * 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" +static char const ntpdc_opt_strs[1860] = +/* 0 */ "ntpdc 4.2.7p253\n" + "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n" "This is free software. It is licensed for use, modification and\n" "redistribution under the terms of the NTP License, copies of which\n" "can be seen at:\n" " \n" - " \n\0" -/* 334 */ "Permission to use, copy, modify, and distribute this software and its\n" + " \n\0" +/* 315 */ "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" + "documentation, and that the name The University of Delaware not be used in\n" + "advertising or publicity pertaining to distribution of the software\n" + "without specific, written prior permission. The University of Delaware\n" + "makes no representations about the suitability this software for any\n" + "purpose. It is provided \"as is\" without express or implied warranty.\n\0" +/* 953 */ "Force IPv4 DNS name resolution\0" +/* 984 */ "IPV4\0" +/* 989 */ "ipv4\0" +/* 994 */ "Force IPv6 DNS name resolution\0" +/* 1025 */ "IPV6\0" +/* 1030 */ "ipv6\0" +/* 1035 */ "run a command and exit\0" +/* 1058 */ "COMMAND\0" +/* 1066 */ "command\0" +/* 1074 */ "Increase debug verbosity level\0" +/* 1105 */ "DEBUG_LEVEL\0" +/* 1117 */ "debug-level\0" +/* 1129 */ "Set the debug verbosity level\0" +/* 1159 */ "SET_DEBUG_LEVEL\0" +/* 1175 */ "set-debug-level\0" +/* 1191 */ "Force ntpq to operate in interactive mode\0" +/* 1233 */ "INTERACTIVE\0" +/* 1245 */ "interactive\0" +/* 1257 */ "Print a list of the peers\0" +/* 1283 */ "LISTPEERS\0" +/* 1293 */ "listpeers\0" +/* 1303 */ "numeric host addresses\0" +/* 1326 */ "NUMERIC\0" +/* 1334 */ "numeric\0" +/* 1342 */ "PEERS\0" +/* 1348 */ "peers\0" +/* 1354 */ "Show a list of the peers\0" +/* 1379 */ "SHOWPEERS\0" +/* 1389 */ "showpeers\0" +/* 1399 */ "Display extended usage information and exit\0" +/* 1443 */ "help\0" +/* 1448 */ "Extended usage information passed thru pager\0" +/* 1493 */ "more-help\0" +/* 1503 */ "Output version information and exit\0" +/* 1539 */ "version\0" +/* 1547 */ "Save the option state to a config file\0" +/* 1586 */ "save-opts\0" +/* 1596 */ "Load options from a config file\0" +/* 1628 */ "LOAD_OPTS\0" +/* 1638 */ "no-load-opts\0" +/* 1651 */ "no\0" +/* 1654 */ "NTPDC\0" +/* 1660 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p253\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"; +/* 1792 */ ".ntprc\0" +/* 1799 */ "$HOME\0" +/* 1805 */ ".\0" +/* 1807 */ "http://bugs.ntp.org, bugs@ntp.org\0" +/* 1841 */ "\n\n\0" +/* 1844 */ "ntpdc 4.2.7p253"; /* * ipv4 option description with * "Must also have options" and "Incompatible options": */ -#define IPV4_DESC (ntpdc_opt_strs+1034) -#define IPV4_NAME (ntpdc_opt_strs+1065) -#define IPV4_name (ntpdc_opt_strs+1070) +#define IPV4_DESC (ntpdc_opt_strs+953) +#define IPV4_NAME (ntpdc_opt_strs+984) +#define IPV4_name (ntpdc_opt_strs+989) static int const aIpv4CantList[] = { INDEX_OPT_IPV6, NO_EQUIVALENT }; #define IPV4_FLAGS (OPTST_DISABLED) @@ -154,9 +153,9 @@ static int const aIpv4CantList[] = { * ipv6 option description with * "Must also have options" and "Incompatible options": */ -#define IPV6_DESC (ntpdc_opt_strs+1075) -#define IPV6_NAME (ntpdc_opt_strs+1106) -#define IPV6_name (ntpdc_opt_strs+1111) +#define IPV6_DESC (ntpdc_opt_strs+994) +#define IPV6_NAME (ntpdc_opt_strs+1025) +#define IPV6_name (ntpdc_opt_strs+1030) static int const aIpv6CantList[] = { INDEX_OPT_IPV4, NO_EQUIVALENT }; #define IPV6_FLAGS (OPTST_DISABLED) @@ -164,26 +163,26 @@ static int const aIpv6CantList[] = { /* * command option description: */ -#define COMMAND_DESC (ntpdc_opt_strs+1116) -#define COMMAND_NAME (ntpdc_opt_strs+1139) -#define COMMAND_name (ntpdc_opt_strs+1147) +#define COMMAND_DESC (ntpdc_opt_strs+1035) +#define COMMAND_NAME (ntpdc_opt_strs+1058) +#define COMMAND_name (ntpdc_opt_strs+1066) #define COMMAND_FLAGS (OPTST_DISABLED | OPTST_STACKED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) /* * debug-level option description: */ -#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_DESC (ntpdc_opt_strs+1074) +#define DEBUG_LEVEL_NAME (ntpdc_opt_strs+1105) +#define DEBUG_LEVEL_name (ntpdc_opt_strs+1117) #define DEBUG_LEVEL_FLAGS (OPTST_DISABLED) /* * set-debug-level option description: */ -#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_DESC (ntpdc_opt_strs+1129) +#define SET_DEBUG_LEVEL_NAME (ntpdc_opt_strs+1159) +#define SET_DEBUG_LEVEL_name (ntpdc_opt_strs+1175) #define SET_DEBUG_LEVEL_FLAGS (OPTST_DISABLED \ | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING)) @@ -191,9 +190,9 @@ static int const aIpv6CantList[] = { * interactive option description with * "Must also have options" and "Incompatible options": */ -#define INTERACTIVE_DESC (ntpdc_opt_strs+1272) -#define INTERACTIVE_NAME (ntpdc_opt_strs+1314) -#define INTERACTIVE_name (ntpdc_opt_strs+1326) +#define INTERACTIVE_DESC (ntpdc_opt_strs+1191) +#define INTERACTIVE_NAME (ntpdc_opt_strs+1233) +#define INTERACTIVE_name (ntpdc_opt_strs+1245) static int const aInteractiveCantList[] = { INDEX_OPT_COMMAND, INDEX_OPT_LISTPEERS, @@ -205,9 +204,9 @@ static int const aInteractiveCantList[] = { * listpeers option description with * "Must also have options" and "Incompatible options": */ -#define LISTPEERS_DESC (ntpdc_opt_strs+1338) -#define LISTPEERS_NAME (ntpdc_opt_strs+1364) -#define LISTPEERS_name (ntpdc_opt_strs+1374) +#define LISTPEERS_DESC (ntpdc_opt_strs+1257) +#define LISTPEERS_NAME (ntpdc_opt_strs+1283) +#define LISTPEERS_name (ntpdc_opt_strs+1293) static int const aListpeersCantList[] = { INDEX_OPT_COMMAND, NO_EQUIVALENT }; #define LISTPEERS_FLAGS (OPTST_DISABLED) @@ -215,18 +214,18 @@ static int const aListpeersCantList[] = { /* * numeric option description: */ -#define NUMERIC_DESC (ntpdc_opt_strs+1384) -#define NUMERIC_NAME (ntpdc_opt_strs+1407) -#define NUMERIC_name (ntpdc_opt_strs+1415) +#define NUMERIC_DESC (ntpdc_opt_strs+1303) +#define NUMERIC_NAME (ntpdc_opt_strs+1326) +#define NUMERIC_name (ntpdc_opt_strs+1334) #define NUMERIC_FLAGS (OPTST_DISABLED) /* * peers option description with * "Must also have options" and "Incompatible options": */ -#define PEERS_DESC (ntpdc_opt_strs+1338) -#define PEERS_NAME (ntpdc_opt_strs+1423) -#define PEERS_name (ntpdc_opt_strs+1429) +#define PEERS_DESC (ntpdc_opt_strs+1257) +#define PEERS_NAME (ntpdc_opt_strs+1342) +#define PEERS_name (ntpdc_opt_strs+1348) static int const aPeersCantList[] = { INDEX_OPT_COMMAND, NO_EQUIVALENT }; #define PEERS_FLAGS (OPTST_DISABLED) @@ -235,9 +234,9 @@ static int const aPeersCantList[] = { * showpeers option description with * "Must also have options" and "Incompatible options": */ -#define SHOWPEERS_DESC (ntpdc_opt_strs+1435) -#define SHOWPEERS_NAME (ntpdc_opt_strs+1460) -#define SHOWPEERS_name (ntpdc_opt_strs+1470) +#define SHOWPEERS_DESC (ntpdc_opt_strs+1354) +#define SHOWPEERS_NAME (ntpdc_opt_strs+1379) +#define SHOWPEERS_name (ntpdc_opt_strs+1389) static int const aShowpeersCantList[] = { INDEX_OPT_COMMAND, NO_EQUIVALENT }; #define SHOWPEERS_FLAGS (OPTST_DISABLED) @@ -245,11 +244,11 @@ static int const aShowpeersCantList[] = { /* * Help/More_Help/Version option descriptions: */ -#define HELP_DESC (ntpdc_opt_strs+1480) -#define HELP_name (ntpdc_opt_strs+1524) +#define HELP_DESC (ntpdc_opt_strs+1399) +#define HELP_name (ntpdc_opt_strs+1443) #ifdef HAVE_WORKING_FORK -#define MORE_HELP_DESC (ntpdc_opt_strs+1529) -#define MORE_HELP_name (ntpdc_opt_strs+1574) +#define MORE_HELP_DESC (ntpdc_opt_strs+1448) +#define MORE_HELP_name (ntpdc_opt_strs+1493) #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT) #else #define MORE_HELP_DESC NULL @@ -262,14 +261,14 @@ static int const aShowpeersCantList[] = { # define VER_FLAGS (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \ OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT) #endif -#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 VER_DESC (ntpdc_opt_strs+1503) +#define VER_name (ntpdc_opt_strs+1539) +#define SAVE_OPTS_DESC (ntpdc_opt_strs+1547) +#define SAVE_OPTS_name (ntpdc_opt_strs+1586) +#define LOAD_OPTS_DESC (ntpdc_opt_strs+1596) +#define LOAD_OPTS_NAME (ntpdc_opt_strs+1628) +#define NO_LOAD_OPTS_name (ntpdc_opt_strs+1638) +#define LOAD_OPTS_pfx (ntpdc_opt_strs+1651) #define LOAD_OPTS_name (NO_LOAD_OPTS_name + 3) /* * Declare option callback procedures @@ -293,10 +292,10 @@ static tOptProc * When not under test, there are different procs to use */ extern tOptProc - optionBooleanVal, optionNestedVal, optionNumericVal, - optionPagedUsage, optionPrintVersion, optionResetOpt, - optionStackArg, optionTimeDate, optionTimeVal, - optionUnstackArg, optionVendorOption, optionVersionStderr; + ntpOptionPrintVersion, optionBooleanVal, optionNestedVal, + optionNumericVal, optionPagedUsage, optionResetOpt, + optionStackArg, optionTimeDate, optionTimeVal, + optionUnstackArg, optionVendorOption, optionVersionStderr; static tOptProc doOptSet_Debug_Level, doUsageOpt; @@ -307,11 +306,7 @@ static tOptProc #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level #endif /* defined(TEST_NTPDC_OPTS) */ -#ifdef TEST_NTPDC_OPTS -# define VER_PROC optionVersionStderr -#else -# define VER_PROC optionPrintVersion -#endif /* TEST_NTPDC_OPTS */ +#define VER_PROC ntpOptionPrintVersion /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * @@ -508,17 +503,17 @@ static tOptDesc optDesc[OPTION_CT] = { * * Define the Ntpdc Option Environment */ -#define zPROGNAME (ntpdc_opt_strs+1735) -#define zUsageTitle (ntpdc_opt_strs+1741) -#define zRcName (ntpdc_opt_strs+1873) +#define zPROGNAME (ntpdc_opt_strs+1654) +#define zUsageTitle (ntpdc_opt_strs+1660) +#define zRcName (ntpdc_opt_strs+1792) static char const * const apzHomeList[3] = { - ntpdc_opt_strs+1880, - ntpdc_opt_strs+1886, + ntpdc_opt_strs+1799, + ntpdc_opt_strs+1805, NULL }; -#define zBugsAddr (ntpdc_opt_strs+1888) -#define zExplain (ntpdc_opt_strs+1922) +#define zBugsAddr (ntpdc_opt_strs+1807) +#define zExplain (ntpdc_opt_strs+1841) #define zDetail (NULL) -#define zFullVersion (ntpdc_opt_strs+1925) +#define zFullVersion (ntpdc_opt_strs+1844) /* extracted from optcode.tlib near line 315 */ #if defined(ENABLE_NLS) diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h index 37ce1cb61..702e4187c 100644 --- a/ntpdc/ntpdc-opts.h +++ b/ntpdc/ntpdc-opts.h @@ -1,7 +1,7 @@ /* * EDIT THIS FILE WITH CAUTION (ntpdc-opts.h) * - * It has been AutoGen-ed January 25, 2012 at 12:04:02 PM by AutoGen 5.14 + * It has been AutoGen-ed January 26, 2012 at 06:03:49 AM by AutoGen 5.14 * From the definitions ntpdc-opts.def * and the template file options * @@ -18,20 +18,20 @@ * 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. + * Copyright (C) 1970-2012 The University of Delaware, all rights reserved. * This is free software. It is licensed for use, modification and * redistribution under the terms of the NTP License, copies of which * can be seen at: * - * + * * * Permission to use, copy, modify, and distribute this software and its * documentation for any purpose with or without fee is hereby granted, * provided that the above copyright notice appears in all copies and that * both the copyright notice and this permission notice appear in - * supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in + * supporting documentation, and that the name The University of Delaware not be used in * advertising or publicity pertaining to distribution of the software - * without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no + * without specific, written prior permission. The University of Delaware makes no * representations about the suitability this software for any purpose. It * is provided "as is" without express or implied warranty. */ @@ -82,8 +82,8 @@ typedef enum { } teOptIndex; #define OPTION_CT 15 -#define NTPDC_VERSION "4.2.7p252" -#define NTPDC_FULL_VERSION "ntpdc 4.2.7p252" +#define NTPDC_VERSION "4.2.7p253" +#define NTPDC_FULL_VERSION "ntpdc 4.2.7p253" /* * Interface defines for all options. Replace "n" with the UPPER_CASED diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi index 69856fb94..64c972508 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 25, 2012 at 12:04:11 PM by AutoGen 5.14 +# It has been AutoGen-ed January 26, 2012 at 06:03:58 AM by AutoGen 5.14 # From the definitions ntpdc-opts.def # and the template file aginfo.tpl @end ignore @@ -40,7 +40,7 @@ This is the automatically generated usage text for ntpdc: @exampleindent 0 @example -ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p252 +ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p253 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 d32fd506e..08a3e4011 100644 --- a/ntpdc/ntpdc.1ntpdcman +++ b/ntpdc/ntpdc.1ntpdcman @@ -1,8 +1,8 @@ -.TH ntpdc 1ntpdcman "25 Jan 2012" "4.2.7p252" "User Commands" +.TH ntpdc 1ntpdcman "26 Jan 2012" "4.2.7p253" "User Commands" .\" .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.man) .\" -.\" It has been AutoGen-ed January 25, 2012 at 12:04:07 PM by AutoGen 5.14 +.\" It has been AutoGen-ed January 26, 2012 at 06:03:55 AM by AutoGen 5.14 .\" From the definitions ntpdc-opts.def .\" and the template file agman-cmd.tpl .\" @@ -827,7 +827,7 @@ The operation failed or the command syntax was not valid. .SH AUTHORS The formatting directives in this document came from FreeBSD. .SH "COPYRIGHT" -Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved. +Copyright (C) 1970-2012 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .SH BUGS The diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc index aaa7328c8..36f1ed21a 100644 --- a/ntpdc/ntpdc.1ntpdcmdoc +++ b/ntpdc/ntpdc.1ntpdcmdoc @@ -1,9 +1,9 @@ -.Dd January 25 2012 +.Dd January 26 2012 .Dt NTPDC 1ntpdcmdoc User Commands .Os SunOS 5.10 .\" EDIT THIS FILE WITH CAUTION (ntpdc-opts.mdoc) .\" -.\" It has been AutoGen-ed January 25, 2012 at 12:04:11 PM by AutoGen 5.14 +.\" It has been AutoGen-ed January 26, 2012 at 06:03:59 AM by AutoGen 5.14 .\" From the definitions ntpdc-opts.def .\" and the template file agmdoc-cmd.tpl .Sh NAME @@ -773,7 +773,7 @@ The operation failed or the command syntax was not valid. .Sh AUTHORS The formatting directives in this document came from FreeBSD. .Sh "COPYRIGHT" -Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved. +Copyright (C) 1970-2012 The University of Delaware all rights reserved. This program is released under the terms of the NTP license, . .Sh BUGS The diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html index 9a53c7b23..a15c2ab99 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.7p252 of ntpdc. +

This document applies to version 4.2.7p253 of ntpdc.

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

This is the automatically generated usage text for ntpdc: -

ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p252
+
ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p253
 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 7e4fff211..2b30f9fc3 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "25 Jan 2012" "4.2.7p252" "User Commands"
+.TH ntpdc @NTPDC_MS@ "26 Jan 2012" "4.2.7p253" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:07 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:03:55 AM by AutoGen 5.14
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -827,7 +827,7 @@ The operation failed or the command syntax was not valid.
 .SH AUTHORS
 The formatting directives in this document came from FreeBSD.
 .SH "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH BUGS
 The
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index 60dde9479..e0ec2b867 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 25 2012
+.Dd January 26 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 25, 2012 at 12:04:11 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:03:59 AM by AutoGen 5.14
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -773,7 +773,7 @@ The operation failed or the command syntax was not valid.
 .Sh AUTHORS
 The formatting directives in this document came from FreeBSD.
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh BUGS
 The
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 3036a1652..cf9300103 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  January 25, 2012 at 12:04:12 PM by AutoGen 5.14
+ *  It has been AutoGen-ed  January 26, 2012 at 06:04:00 AM by AutoGen 5.14
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -18,20 +18,20 @@
  * 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.
+ *  Copyright (C) 1970-2012 The University of Delaware, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    
- *    
+ *    
  *
  *  Permission to use, copy, modify, and distribute this software and its
  *  documentation for any purpose with or without fee is hereby granted,
  *  provided that the above copyright notice appears in all copies and that
  *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in
+ *  supporting documentation, and that the name The University of Delaware not be used in
  *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no
+ *  without specific, written prior permission. The University of Delaware makes no
  *  representations about the suitability this software for any purpose. It
  *  is provided "as is" without express or implied warranty.
  */
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 #define zCopyright      (ntpq_opt_strs+0)
-#define zLicenseDescrip (ntpq_opt_strs+333)
+#define zLicenseDescrip (ntpq_opt_strs+314)
 
 extern tUsageProc optionUsage;
 /*
@@ -70,79 +70,78 @@ extern tUsageProc optionUsage;
 /*
  *  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"
+static char const ntpq_opt_strs[1831] =
+/*     0 */ "ntpq 4.2.7p253\n"
+            "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  \n"
-            "  \n\0"
-/*   333 */ "Permission to use, copy, modify, and distribute this software and its\n"
+            "  \n\0"
+/*   314 */ "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"
+            "documentation, and that the name The University of Delaware not be used in\n"
+            "advertising or publicity pertaining to distribution of the software\n"
+            "without specific, written prior permission. The University of Delaware\n"
+            "makes no representations about the suitability this software for any\n"
+            "purpose. It is provided \"as is\" without express or implied warranty.\n\0"
+/*   952 */ "Force IPv4 DNS name resolution\0"
+/*   983 */ "IPV4\0"
+/*   988 */ "ipv4\0"
+/*   993 */ "Force IPv6 DNS name resolution\0"
+/*  1024 */ "IPV6\0"
+/*  1029 */ "ipv6\0"
+/*  1034 */ "run a command and exit\0"
+/*  1057 */ "COMMAND\0"
+/*  1065 */ "command\0"
+/*  1073 */ "Increase debug verbosity level\0"
+/*  1104 */ "DEBUG_LEVEL\0"
+/*  1116 */ "debug-level\0"
+/*  1128 */ "Set the debug verbosity level\0"
+/*  1158 */ "SET_DEBUG_LEVEL\0"
+/*  1174 */ "set-debug-level\0"
+/*  1190 */ "Print a list of the peers\0"
+/*  1216 */ "PEERS\0"
+/*  1222 */ "peers\0"
+/*  1228 */ "Force ntpq to operate in interactive mode\0"
+/*  1270 */ "INTERACTIVE\0"
+/*  1282 */ "interactive\0"
+/*  1294 */ "numeric host addresses\0"
+/*  1317 */ "NUMERIC\0"
+/*  1325 */ "numeric\0"
+/*  1333 */ "Always output status line with readvar\0"
+/*  1372 */ "OLD_RV\0"
+/*  1379 */ "old-rv\0"
+/*  1386 */ "Display extended usage information and exit\0"
+/*  1430 */ "help\0"
+/*  1435 */ "Extended usage information passed thru pager\0"
+/*  1480 */ "more-help\0"
+/*  1490 */ "Output version information and exit\0"
+/*  1526 */ "version\0"
+/*  1534 */ "Save the option state to a config file\0"
+/*  1573 */ "save-opts\0"
+/*  1583 */ "Load options from a config file\0"
+/*  1615 */ "LOAD_OPTS\0"
+/*  1625 */ "no-load-opts\0"
+/*  1638 */ "no\0"
+/*  1641 */ "NTPQ\0"
+/*  1646 */ "ntpq - standard NTP query program - Ver. 4.2.7p253\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";
+/*  1767 */ ".ntprc\0"
+/*  1774 */ "$HOME\0"
+/*  1780 */ ".\0"
+/*  1782 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1816 */ "ntpq 4.2.7p253";
 
 /*
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
-#define IPV4_DESC      (ntpq_opt_strs+1033)
-#define IPV4_NAME      (ntpq_opt_strs+1064)
-#define IPV4_name      (ntpq_opt_strs+1069)
+#define IPV4_DESC      (ntpq_opt_strs+952)
+#define IPV4_NAME      (ntpq_opt_strs+983)
+#define IPV4_name      (ntpq_opt_strs+988)
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
 #define IPV4_FLAGS     (OPTST_DISABLED)
@@ -151,9 +150,9 @@ static int const aIpv4CantList[] = {
  *  ipv6 option description with
  *  "Must also have options" and "Incompatible options":
  */
-#define IPV6_DESC      (ntpq_opt_strs+1074)
-#define IPV6_NAME      (ntpq_opt_strs+1105)
-#define IPV6_name      (ntpq_opt_strs+1110)
+#define IPV6_DESC      (ntpq_opt_strs+993)
+#define IPV6_NAME      (ntpq_opt_strs+1024)
+#define IPV6_name      (ntpq_opt_strs+1029)
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
 #define IPV6_FLAGS     (OPTST_DISABLED)
@@ -161,26 +160,26 @@ static int const aIpv6CantList[] = {
 /*
  *  command option description:
  */
-#define COMMAND_DESC      (ntpq_opt_strs+1115)
-#define COMMAND_NAME      (ntpq_opt_strs+1138)
-#define COMMAND_name      (ntpq_opt_strs+1146)
+#define COMMAND_DESC      (ntpq_opt_strs+1034)
+#define COMMAND_NAME      (ntpq_opt_strs+1057)
+#define COMMAND_name      (ntpq_opt_strs+1065)
 #define COMMAND_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  debug-level option description:
  */
-#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_DESC      (ntpq_opt_strs+1073)
+#define DEBUG_LEVEL_NAME      (ntpq_opt_strs+1104)
+#define DEBUG_LEVEL_name      (ntpq_opt_strs+1116)
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
 /*
  *  set-debug-level option description:
  */
-#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_DESC      (ntpq_opt_strs+1128)
+#define SET_DEBUG_LEVEL_NAME      (ntpq_opt_strs+1158)
+#define SET_DEBUG_LEVEL_name      (ntpq_opt_strs+1174)
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -188,9 +187,9 @@ static int const aIpv6CantList[] = {
  *  peers option description with
  *  "Must also have options" and "Incompatible options":
  */
-#define PEERS_DESC      (ntpq_opt_strs+1271)
-#define PEERS_NAME      (ntpq_opt_strs+1297)
-#define PEERS_name      (ntpq_opt_strs+1303)
+#define PEERS_DESC      (ntpq_opt_strs+1190)
+#define PEERS_NAME      (ntpq_opt_strs+1216)
+#define PEERS_name      (ntpq_opt_strs+1222)
 static int const aPeersCantList[] = {
     INDEX_OPT_INTERACTIVE, NO_EQUIVALENT };
 #define PEERS_FLAGS     (OPTST_DISABLED)
@@ -199,9 +198,9 @@ static int const aPeersCantList[] = {
  *  interactive option description with
  *  "Must also have options" and "Incompatible options":
  */
-#define INTERACTIVE_DESC      (ntpq_opt_strs+1309)
-#define INTERACTIVE_NAME      (ntpq_opt_strs+1351)
-#define INTERACTIVE_name      (ntpq_opt_strs+1363)
+#define INTERACTIVE_DESC      (ntpq_opt_strs+1228)
+#define INTERACTIVE_NAME      (ntpq_opt_strs+1270)
+#define INTERACTIVE_name      (ntpq_opt_strs+1282)
 static int const aInteractiveCantList[] = {
     INDEX_OPT_COMMAND,
     INDEX_OPT_PEERS, NO_EQUIVALENT };
@@ -210,27 +209,27 @@ static int const aInteractiveCantList[] = {
 /*
  *  numeric option description:
  */
-#define NUMERIC_DESC      (ntpq_opt_strs+1375)
-#define NUMERIC_NAME      (ntpq_opt_strs+1398)
-#define NUMERIC_name      (ntpq_opt_strs+1406)
+#define NUMERIC_DESC      (ntpq_opt_strs+1294)
+#define NUMERIC_NAME      (ntpq_opt_strs+1317)
+#define NUMERIC_name      (ntpq_opt_strs+1325)
 #define NUMERIC_FLAGS     (OPTST_DISABLED)
 
 /*
  *  old-rv option description:
  */
-#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_DESC      (ntpq_opt_strs+1333)
+#define OLD_RV_NAME      (ntpq_opt_strs+1372)
+#define OLD_RV_name      (ntpq_opt_strs+1379)
 #define OLD_RV_FLAGS     (OPTST_DISABLED)
 
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpq_opt_strs+1467)
-#define HELP_name       (ntpq_opt_strs+1511)
+#define HELP_DESC       (ntpq_opt_strs+1386)
+#define HELP_name       (ntpq_opt_strs+1430)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpq_opt_strs+1516)
-#define MORE_HELP_name  (ntpq_opt_strs+1561)
+#define MORE_HELP_DESC  (ntpq_opt_strs+1435)
+#define MORE_HELP_name  (ntpq_opt_strs+1480)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  NULL
@@ -243,14 +242,14 @@ static int const aInteractiveCantList[] = {
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#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 VER_DESC        (ntpq_opt_strs+1490)
+#define VER_name        (ntpq_opt_strs+1526)
+#define SAVE_OPTS_DESC  (ntpq_opt_strs+1534)
+#define SAVE_OPTS_name  (ntpq_opt_strs+1573)
+#define LOAD_OPTS_DESC     (ntpq_opt_strs+1583)
+#define LOAD_OPTS_NAME     (ntpq_opt_strs+1615)
+#define NO_LOAD_OPTS_name  (ntpq_opt_strs+1625)
+#define LOAD_OPTS_pfx      (ntpq_opt_strs+1638)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /*
  *  Declare option callback procedures
@@ -278,8 +277,8 @@ static tOptProc
  *  When not under test, there are different procs to use
  */
 extern tOptProc
-    ntpq_custom_opt_handler, optionBooleanVal,        optionNestedVal,
-    optionNumericVal,        optionPagedUsage,        optionPrintVersion,
+    ntpOptionPrintVersion,   ntpq_custom_opt_handler, optionBooleanVal,
+    optionNestedVal,         optionNumericVal,        optionPagedUsage,
     optionResetOpt,          optionStackArg,          optionTimeDate,
     optionTimeVal,           optionUnstackArg,        optionVendorOption,
     optionVersionStderr;
@@ -297,11 +296,7 @@ static tOptProc
 #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level
 #define PEERS_OPT_PROC ntpq_custom_opt_handler
 #endif /* defined(TEST_NTPQ_OPTS) */
-#ifdef TEST_NTPQ_OPTS
-# define VER_PROC       optionVersionStderr
-#else
-# define VER_PROC       optionPrintVersion
-#endif /* TEST_NTPQ_OPTS */
+#define VER_PROC        ntpOptionPrintVersion
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
@@ -486,17 +481,17 @@ static tOptDesc optDesc[OPTION_CT] = {
  *
  *  Define the Ntpq Option Environment
  */
-#define zPROGNAME       (ntpq_opt_strs+1722)
-#define zUsageTitle     (ntpq_opt_strs+1727)
-#define zRcName         (ntpq_opt_strs+1848)
+#define zPROGNAME       (ntpq_opt_strs+1641)
+#define zUsageTitle     (ntpq_opt_strs+1646)
+#define zRcName         (ntpq_opt_strs+1767)
 static char const * const apzHomeList[3] = {
-    ntpq_opt_strs+1855,
-    ntpq_opt_strs+1861,
+    ntpq_opt_strs+1774,
+    ntpq_opt_strs+1780,
     NULL };
-#define zBugsAddr       (ntpq_opt_strs+1863)
+#define zBugsAddr       (ntpq_opt_strs+1782)
 #define zExplain        (NULL)
 #define zDetail         (NULL)
-#define zFullVersion    (ntpq_opt_strs+1897)
+#define zFullVersion    (ntpq_opt_strs+1816)
 /* extracted from optcode.tlib near line 315 */
 
 #if defined(ENABLE_NLS)
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 8019bb4ba..645ab9072 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  January 25, 2012 at 12:04:12 PM by AutoGen 5.14
+ *  It has been AutoGen-ed  January 26, 2012 at 06:04:00 AM by AutoGen 5.14
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -18,20 +18,20 @@
  * 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.
+ *  Copyright (C) 1970-2012 The University of Delaware, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    
- *    
+ *    
  *
  *  Permission to use, copy, modify, and distribute this software and its
  *  documentation for any purpose with or without fee is hereby granted,
  *  provided that the above copyright notice appears in all copies and that
  *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in
+ *  supporting documentation, and that the name The University of Delaware not be used in
  *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no
+ *  without specific, written prior permission. The University of Delaware makes no
  *  representations about the suitability this software for any purpose. It
  *  is provided "as is" without express or implied warranty.
  */
@@ -81,8 +81,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p252"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p252"
+#define NTPQ_VERSION       "4.2.7p253"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p253"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index 32338d554..f8ff84df2 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 25, 2012 at 12:04:36 PM by AutoGen 5.14
+# It has been AutoGen-ed  January 26, 2012 at 06:04:10 AM by AutoGen 5.14
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -40,7 +40,7 @@ This is the automatically generated usage text for ntpq:
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p252
+ntpq - standard NTP query program - Ver. 4.2.7p253
 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 24f4d94c6..5f4eb51bf 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "25 Jan 2012" "4.2.7p252" "User Commands"
+.TH ntpq 1ntpqman "26 Jan 2012" "4.2.7p253" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:33 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:07 AM by AutoGen 5.14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -386,9 +386,9 @@ Successful program execution.
 .BR 1
 The operation failed or the command syntax was not valid.
 .SH "AUTHORS"
-The University of Delaware, David L. Mills, and/or others
+The University of Delaware
 .SH "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index b7c1a6210..1e1ee6fe2 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd January 25 2012
+.Dd January 26 2012
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:36 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:10 AM by AutoGen 5.14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -364,9 +364,9 @@ Successful program execution.
 The operation failed or the command syntax was not valid.
 .El
 .Sh "AUTHORS"
-The University of Delaware, David L. Mills, and/or others
+The University of Delaware
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index 8e1005455..b347ab756 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "25 Jan 2012" "4.2.7p252" "User Commands"
+.TH ntpq @NTPQ_MS@ "26 Jan 2012" "4.2.7p253" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:33 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:07 AM by AutoGen 5.14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -386,9 +386,9 @@ Successful program execution.
 .BR 1
 The operation failed or the command syntax was not valid.
 .SH "AUTHORS"
-The University of Delaware, David L. Mills, and/or others
+The University of Delaware
 .SH "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 0a2acda87..924c55cb6 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 25 2012
+.Dd January 26 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 25, 2012 at 12:04:36 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:10 AM by AutoGen 5.14
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -364,9 +364,9 @@ Successful program execution.
 The operation failed or the command syntax was not valid.
 .El
 .Sh "AUTHORS"
-The University of Delaware, David L. Mills, and/or others
+The University of Delaware
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 271034c7b..fb577c223 100644
--- a/ntpsnmpd/ntpsnmpd-opts.c
+++ b/ntpsnmpd/ntpsnmpd-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.c)
  *  
- *  It has been AutoGen-ed  January 25, 2012 at 12:04:37 PM by AutoGen 5.14
+ *  It has been AutoGen-ed  January 26, 2012 at 06:04:11 AM by AutoGen 5.14
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -18,20 +18,20 @@
  * 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.
+ *  Copyright (C) 1970-2012 The University of Delaware, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    
- *    
+ *    
  *
  *  Permission to use, copy, modify, and distribute this software and its
  *  documentation for any purpose with or without fee is hereby granted,
  *  provided that the above copyright notice appears in all copies and that
  *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in
+ *  supporting documentation, and that the name The University of Delaware not be used in
  *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no
+ *  without specific, written prior permission. The University of Delaware makes no
  *  representations about the suitability this software for any purpose. It
  *  is provided "as is" without express or implied warranty.
  */
@@ -52,7 +52,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 #define zCopyright      (ntpsnmpd_opt_strs+0)
-#define zLicenseDescrip (ntpsnmpd_opt_strs+337)
+#define zLicenseDescrip (ntpsnmpd_opt_strs+318)
 
 extern tUsageProc optionUsage;
 
@@ -63,90 +63,89 @@ extern tUsageProc optionUsage;
 /*
  *  ntpsnmpd option static const strings
  */
-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"
+static char const ntpsnmpd_opt_strs[1559] =
+/*     0 */ "ntpsnmpd 4.2.7p253\n"
+            "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  \n"
-            "  \n\0"
-/*   337 */ "Permission to use, copy, modify, and distribute this software and its\n"
+            "  \n\0"
+/*   318 */ "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"
+            "documentation, and that the name The University of Delaware not be used in\n"
+            "advertising or publicity pertaining to distribution of the software\n"
+            "without specific, written prior permission. The University of Delaware\n"
+            "makes no representations about the suitability this software for any\n"
+            "purpose. It is provided \"as is\" without express or implied warranty.\n\0"
+/*   956 */ "Do not fork\0"
+/*   968 */ "NOFORK\0"
+/*   975 */ "nofork\0"
+/*   982 */ "Log to syslog()\0"
+/*   998 */ "SYSLOG\0"
+/*  1005 */ "syslog\0"
+/*  1012 */ "The socket address ntpsnmpd uses to connect to net-snmpd\0"
+/*  1069 */ "AGENTXSOCKET\0"
+/*  1082 */ "agentxsocket\0"
+/*  1095 */ "unix:/var/agentx/master\0"
+/*  1119 */ "Display extended usage information and exit\0"
+/*  1163 */ "help\0"
+/*  1168 */ "Extended usage information passed thru pager\0"
+/*  1213 */ "more-help\0"
+/*  1223 */ "Output version information and exit\0"
+/*  1259 */ "version\0"
+/*  1267 */ "Save the option state to a config file\0"
+/*  1306 */ "save-opts\0"
+/*  1316 */ "Load options from a config file\0"
+/*  1348 */ "LOAD_OPTS\0"
+/*  1358 */ "no-load-opts\0"
+/*  1371 */ "no\0"
+/*  1374 */ "NTPSNMPD\0"
+/*  1383 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p253\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";
+/*  1488 */ ".ntprc\0"
+/*  1495 */ "$HOME\0"
+/*  1501 */ ".\0"
+/*  1503 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  1537 */ "\n\n\0"
+/*  1540 */ "ntpsnmpd 4.2.7p253";
 
 /*
  *  nofork option description:
  */
-#define NOFORK_DESC      (ntpsnmpd_opt_strs+1037)
-#define NOFORK_NAME      (ntpsnmpd_opt_strs+1049)
-#define NOFORK_name      (ntpsnmpd_opt_strs+1056)
+#define NOFORK_DESC      (ntpsnmpd_opt_strs+956)
+#define NOFORK_NAME      (ntpsnmpd_opt_strs+968)
+#define NOFORK_name      (ntpsnmpd_opt_strs+975)
 #define NOFORK_FLAGS     (OPTST_DISABLED)
 
 /*
  *  syslog option description:
  */
-#define SYSLOG_DESC      (ntpsnmpd_opt_strs+1063)
-#define SYSLOG_NAME      (ntpsnmpd_opt_strs+1079)
-#define SYSLOG_name      (ntpsnmpd_opt_strs+1086)
+#define SYSLOG_DESC      (ntpsnmpd_opt_strs+982)
+#define SYSLOG_NAME      (ntpsnmpd_opt_strs+998)
+#define SYSLOG_name      (ntpsnmpd_opt_strs+1005)
 #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_DESC      (ntpsnmpd_opt_strs+1012)
+#define AGENTXSOCKET_NAME      (ntpsnmpd_opt_strs+1069)
+#define AGENTXSOCKET_name      (ntpsnmpd_opt_strs+1082)
+#define AGENTXSOCKET_DFT_ARG   (ntpsnmpd_opt_strs+1095)
 #define AGENTXSOCKET_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpsnmpd_opt_strs+1200)
-#define HELP_name       (ntpsnmpd_opt_strs+1244)
+#define HELP_DESC       (ntpsnmpd_opt_strs+1119)
+#define HELP_name       (ntpsnmpd_opt_strs+1163)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpsnmpd_opt_strs+1249)
-#define MORE_HELP_name  (ntpsnmpd_opt_strs+1294)
+#define MORE_HELP_DESC  (ntpsnmpd_opt_strs+1168)
+#define MORE_HELP_name  (ntpsnmpd_opt_strs+1213)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  NULL
@@ -159,14 +158,14 @@ static char const ntpsnmpd_opt_strs[1640] =
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#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 VER_DESC        (ntpsnmpd_opt_strs+1223)
+#define VER_name        (ntpsnmpd_opt_strs+1259)
+#define SAVE_OPTS_DESC  (ntpsnmpd_opt_strs+1267)
+#define SAVE_OPTS_name  (ntpsnmpd_opt_strs+1306)
+#define LOAD_OPTS_DESC     (ntpsnmpd_opt_strs+1316)
+#define LOAD_OPTS_NAME     (ntpsnmpd_opt_strs+1348)
+#define NO_LOAD_OPTS_name  (ntpsnmpd_opt_strs+1358)
+#define LOAD_OPTS_pfx      (ntpsnmpd_opt_strs+1371)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /*
  *  Declare option callback procedures
@@ -184,18 +183,14 @@ static tOptProc
  *  When not under test, there are different procs to use
  */
 extern tOptProc
-    optionBooleanVal,    optionNestedVal,     optionNumericVal,
-    optionPagedUsage,    optionPrintVersion,  optionResetOpt,
-    optionStackArg,      optionTimeDate,      optionTimeVal,
-    optionUnstackArg,    optionVendorOption,  optionVersionStderr;
+    ntpOptionPrintVersion, optionBooleanVal,      optionNestedVal,
+    optionNumericVal,      optionPagedUsage,      optionResetOpt,
+    optionStackArg,        optionTimeDate,        optionTimeVal,
+    optionUnstackArg,      optionVendorOption,    optionVersionStderr;
 static tOptProc
     doUsageOpt;
 #endif /* defined(TEST_NTPSNMPD_OPTS) */
-#ifdef TEST_NTPSNMPD_OPTS
-# define VER_PROC       optionVersionStderr
-#else
-# define VER_PROC       optionPrintVersion
-#endif /* TEST_NTPSNMPD_OPTS */
+#define VER_PROC        ntpOptionPrintVersion
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
@@ -308,17 +303,17 @@ static tOptDesc optDesc[OPTION_CT] = {
  *
  *  Define the Ntpsnmpd Option Environment
  */
-#define zPROGNAME       (ntpsnmpd_opt_strs+1455)
-#define zUsageTitle     (ntpsnmpd_opt_strs+1464)
-#define zRcName         (ntpsnmpd_opt_strs+1569)
+#define zPROGNAME       (ntpsnmpd_opt_strs+1374)
+#define zUsageTitle     (ntpsnmpd_opt_strs+1383)
+#define zRcName         (ntpsnmpd_opt_strs+1488)
 static char const * const apzHomeList[3] = {
-    ntpsnmpd_opt_strs+1576,
-    ntpsnmpd_opt_strs+1582,
+    ntpsnmpd_opt_strs+1495,
+    ntpsnmpd_opt_strs+1501,
     NULL };
-#define zBugsAddr       (ntpsnmpd_opt_strs+1584)
-#define zExplain        (ntpsnmpd_opt_strs+1618)
+#define zBugsAddr       (ntpsnmpd_opt_strs+1503)
+#define zExplain        (ntpsnmpd_opt_strs+1537)
 #define zDetail         (NULL)
-#define zFullVersion    (ntpsnmpd_opt_strs+1621)
+#define zFullVersion    (ntpsnmpd_opt_strs+1540)
 /* extracted from optcode.tlib near line 315 */
 
 #if defined(ENABLE_NLS)
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index 5febb8020..e0a1fef41 100644
--- a/ntpsnmpd/ntpsnmpd-opts.h
+++ b/ntpsnmpd/ntpsnmpd-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.h)
  *  
- *  It has been AutoGen-ed  January 25, 2012 at 12:04:37 PM by AutoGen 5.14
+ *  It has been AutoGen-ed  January 26, 2012 at 06:04:11 AM by AutoGen 5.14
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -18,20 +18,20 @@
  * 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.
+ *  Copyright (C) 1970-2012 The University of Delaware, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    
- *    
+ *    
  *
  *  Permission to use, copy, modify, and distribute this software and its
  *  documentation for any purpose with or without fee is hereby granted,
  *  provided that the above copyright notice appears in all copies and that
  *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in
+ *  supporting documentation, and that the name The University of Delaware not be used in
  *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no
+ *  without specific, written prior permission. The University of Delaware makes no
  *  representations about the suitability this software for any purpose. It
  *  is provided "as is" without express or implied warranty.
  */
@@ -75,8 +75,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p252"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p252"
+#define NTPSNMPD_VERSION       "4.2.7p253"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p253"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd-opts.texi b/ntpsnmpd/ntpsnmpd-opts.texi
index 5200577a9..eed7ebade 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 25, 2012 at 12:04:45 PM by AutoGen 5.14
+# It has been AutoGen-ed  January 26, 2012 at 06:04:17 AM by AutoGen 5.14
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -33,7 +33,7 @@ This is the automatically generated usage text for ntpsnmpd:
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p252
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p253
 USAGE:  ntpsnmpd [ - [] | --[@{=| @}] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index baa9fd6f4..ea3b1300e 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "25 Jan 2012" "4.2.7p252" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "26 Jan 2012" "4.2.7p253" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:43 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:14 AM by AutoGen 5.14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -83,7 +83,7 @@ The operation failed or the command syntax was not valid.
 .SH AUTHORS
 .An "Heiko Gerstung"
 .SH "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index 5dc2559a4..995300fb1 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd January 25 2012
+.Dd January 26 2012
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:45 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:17 AM by AutoGen 5.14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -80,7 +80,7 @@ The operation failed or the command syntax was not valid.
 .Sh AUTHORS
 .An "Heiko Gerstung"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index 473060359..f40eb9c7b 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "25 Jan 2012" "4.2.7p252" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "26 Jan 2012" "4.2.7p253" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:04:43 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:14 AM by AutoGen 5.14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -83,7 +83,7 @@ The operation failed or the command syntax was not valid.
 .SH AUTHORS
 .An "Heiko Gerstung"
 .SH "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index 05d1b04c7..a17e85987 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 25 2012
+.Dd January 26 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 25, 2012 at 12:04:45 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:17 AM by AutoGen 5.14
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -80,7 +80,7 @@ The operation failed or the command syntax was not valid.
 .Sh AUTHORS
 .An "Heiko Gerstung"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/packageinfo.sh b/packageinfo.sh
index 8f541f67c..94c19b2bd 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=252
+point=253
 
 ### 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 ba5d62004..e34395d43 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 25, 2012 at 12:01:54 PM by AutoGen 5.14
+# It has been AutoGen-ed  January 26, 2012 at 06:03:28 AM by AutoGen 5.14
 # From the definitions    ntp-wait-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman
index e67320b20..3c29d8364 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "25 Jan 2012" "ntp (4.2.7p252)" "User Commands"
+.TH ntp-wait 1ntp-waitman "26 Jan 2012" "ntp (4.2.7p253)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:01:51 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:03:26 AM by AutoGen 5.14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -89,7 +89,7 @@ The operation failed or the command syntax was not valid.
 .SH AUTHORS
 .An "Harlan Stenn"
 .SH "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/scripts/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait.1ntp-waitmdoc
index 81f21b0db..7175229f5 100644
--- a/scripts/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd January 25 2012
+.Dd January 26 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 25, 2012 at 12:01:55 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:03:29 AM by AutoGen 5.14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -88,7 +88,7 @@ The operation failed or the command syntax was not valid.
 .Sh AUTHORS
 .An "Harlan Stenn"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/scripts/ntp-wait.html b/scripts/ntp-wait.html
index 008a0e7aa..d22757087 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.7p252 of ntp-wait.
+  
This document applies to version 4.2.7p253 of ntp-wait.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
diff --git a/scripts/ntp-wait.man.in b/scripts/ntp-wait.man.in
index 8f9ef105b..6cc2d47e3 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "25 Jan 2012" "ntp (4.2.7p252)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "26 Jan 2012" "ntp (4.2.7p253)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:01:51 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:03:26 AM by AutoGen 5.14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -89,7 +89,7 @@ The operation failed or the command syntax was not valid.
 .SH AUTHORS
 .An "Harlan Stenn"
 .SH "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/scripts/ntp-wait.mdoc.in b/scripts/ntp-wait.mdoc.in
index 6fe9d722d..ec716818a 100644
--- a/scripts/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 25 2012
+.Dd January 26 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 25, 2012 at 12:01:55 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:03:29 AM by AutoGen 5.14
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -88,7 +88,7 @@ The operation failed or the command syntax was not valid.
 .Sh AUTHORS
 .An "Harlan Stenn"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh "BUGS"
 Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index a4ecd5f17..86240ef11 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  January 25, 2012 at 12:05:08 PM by AutoGen 5.14
+ *  It has been AutoGen-ed  January 26, 2012 at 06:00:55 AM by AutoGen 5.14
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -18,20 +18,20 @@
  * 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.
+ *  Copyright (C) 1970-2012 The University of Delaware, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    
- *    
+ *    
  *
  *  Permission to use, copy, modify, and distribute this software and its
  *  documentation for any purpose with or without fee is hereby granted,
  *  provided that the above copyright notice appears in all copies and that
  *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in
+ *  supporting documentation, and that the name The University of Delaware not be used in
  *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no
+ *  without specific, written prior permission. The University of Delaware makes no
  *  representations about the suitability this software for any purpose. It
  *  is provided "as is" without express or implied warranty.
  */
@@ -53,7 +53,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 #define zCopyright      (sntp_opt_strs+0)
-#define zLicenseDescrip (sntp_opt_strs+333)
+#define zLicenseDescrip (sntp_opt_strs+314)
 
 extern tUsageProc optionUsage;
 /*
@@ -71,112 +71,111 @@ extern tUsageProc optionUsage;
 /*
  *  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"
+static char const sntp_opt_strs[2613] =
+/*     0 */ "sntp 4.2.7p253\n"
+            "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  \n"
-            "  \n\0"
-/*   333 */ "Permission to use, copy, modify, and distribute this software and its\n"
+            "  \n\0"
+/*   314 */ "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"
+            "documentation, and that the name The University of Delaware not be used in\n"
+            "advertising or publicity pertaining to distribution of the software\n"
+            "without specific, written prior permission. The University of Delaware\n"
+            "makes no representations about the suitability this software for any\n"
+            "purpose. It is provided \"as is\" without express or implied warranty.\n\0"
+/*   952 */ "Force IPv4 DNS name resolution\0"
+/*   983 */ "IPV4\0"
+/*   988 */ "ipv4\0"
+/*   993 */ "Force IPv6 DNS name resolution\0"
+/*  1024 */ "IPV6\0"
+/*  1029 */ "ipv6\0"
+/*  1034 */ "Enable authentication with the key @var{auth-keynumber}\0"
+/*  1090 */ "AUTHENTICATION\0"
+/*  1105 */ "authentication\0"
+/*  1120 */ "The number of seconds to wait for broadcasts\0"
+/*  1165 */ "BCTIMEOUT\0"
+/*  1175 */ "bctimeout\0"
+/*  1185 */ "Listen to the address specified for broadcast time sync\0"
+/*  1241 */ "BROADCAST\0"
+/*  1251 */ "broadcast\0"
+/*  1261 */ "Concurrently query all IPs returned for host-name\0"
+/*  1311 */ "CONCURRENT\0"
+/*  1322 */ "concurrent\0"
+/*  1333 */ "Increase debug verbosity level\0"
+/*  1364 */ "DEBUG_LEVEL\0"
+/*  1376 */ "debug-level\0"
+/*  1388 */ "Set the debug verbosity level\0"
+/*  1418 */ "SET_DEBUG_LEVEL\0"
+/*  1434 */ "set-debug-level\0"
+/*  1450 */ "The gap (in milliseconds) between time requests\0"
+/*  1498 */ "GAP\0"
+/*  1502 */ "gap\0"
+/*  1506 */ "KoD history filename\0"
+/*  1527 */ "KOD\0"
+/*  1531 */ "kod\0"
+/*  1535 */ "/var/db/ntp-kod\0"
+/*  1551 */ "Look in this file for the key specified with @option{-a}\0"
+/*  1608 */ "KEYFILE\0"
+/*  1616 */ "keyfile\0"
+/*  1624 */ "Log to specified logfile\0"
+/*  1649 */ "LOGFILE\0"
+/*  1657 */ "logfile\0"
+/*  1665 */ "Adjustments less than @var{steplimit} msec will be slewed\0"
+/*  1723 */ "STEPLIMIT\0"
+/*  1733 */ "steplimit\0"
+/*  1743 */ "Send @var{int} as our NTP version\0"
+/*  1777 */ "NTPVERSION\0"
+/*  1788 */ "ntpversion\0"
+/*  1799 */ "Use the NTP Reserved Port (port 123)\0"
+/*  1836 */ "USERESERVEDPORT\0"
+/*  1852 */ "usereservedport\0"
+/*  1868 */ "OK to 'step' the time with @command{settimeofday(2)}\0"
+/*  1921 */ "STEP\0"
+/*  1926 */ "step\0"
+/*  1931 */ "OK to 'slew' the time with @command{adjtime(2)}\0"
+/*  1979 */ "SLEW\0"
+/*  1984 */ "slew\0"
+/*  1989 */ "The number of seconds to wait for unicast responses\0"
+/*  2041 */ "UCTIMEOUT\0"
+/*  2051 */ "uctimeout\0"
+/*  2061 */ "Wait for pending replies (if not setting the time)\0"
+/*  2112 */ "WAIT\0"
+/*  2117 */ "no-wait\0"
+/*  2125 */ "no\0"
+/*  2128 */ "Display extended usage information and exit\0"
+/*  2172 */ "help\0"
+/*  2177 */ "Extended usage information passed thru pager\0"
+/*  2222 */ "more-help\0"
+/*  2232 */ "Output version information and exit\0"
+/*  2268 */ "version\0"
+/*  2276 */ "Save the option state to a config file\0"
+/*  2315 */ "save-opts\0"
+/*  2325 */ "Load options from a config file\0"
+/*  2357 */ "LOAD_OPTS\0"
+/*  2367 */ "no-load-opts\0"
+/*  2380 */ "SNTP\0"
+/*  2385 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p253\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";
+/*  2546 */ ".ntprc\0"
+/*  2553 */ "$HOME\0"
+/*  2559 */ ".\0"
+/*  2561 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  2595 */ "\n\n\0"
+/*  2598 */ "sntp 4.2.7p253";
 
 /*
  *  ipv4 option description with
  *  "Must also have options" and "Incompatible options":
  */
-#define IPV4_DESC      (sntp_opt_strs+1033)
-#define IPV4_NAME      (sntp_opt_strs+1064)
-#define IPV4_name      (sntp_opt_strs+1069)
+#define IPV4_DESC      (sntp_opt_strs+952)
+#define IPV4_NAME      (sntp_opt_strs+983)
+#define IPV4_name      (sntp_opt_strs+988)
 static int const aIpv4CantList[] = {
     INDEX_OPT_IPV6, NO_EQUIVALENT };
 #define IPV4_FLAGS     (OPTST_DISABLED)
@@ -185,9 +184,9 @@ static int const aIpv4CantList[] = {
  *  ipv6 option description with
  *  "Must also have options" and "Incompatible options":
  */
-#define IPV6_DESC      (sntp_opt_strs+1074)
-#define IPV6_NAME      (sntp_opt_strs+1105)
-#define IPV6_name      (sntp_opt_strs+1110)
+#define IPV6_DESC      (sntp_opt_strs+993)
+#define IPV6_NAME      (sntp_opt_strs+1024)
+#define IPV6_name      (sntp_opt_strs+1029)
 static int const aIpv6CantList[] = {
     INDEX_OPT_IPV4, NO_EQUIVALENT };
 #define IPV6_FLAGS     (OPTST_DISABLED)
@@ -195,18 +194,18 @@ static int const aIpv6CantList[] = {
 /*
  *  authentication option description:
  */
-#define AUTHENTICATION_DESC      (sntp_opt_strs+1115)
-#define AUTHENTICATION_NAME      (sntp_opt_strs+1171)
-#define AUTHENTICATION_name      (sntp_opt_strs+1186)
+#define AUTHENTICATION_DESC      (sntp_opt_strs+1034)
+#define AUTHENTICATION_NAME      (sntp_opt_strs+1090)
+#define AUTHENTICATION_name      (sntp_opt_strs+1105)
 #define AUTHENTICATION_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
  *  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_DESC      (sntp_opt_strs+1120)
+#define BCTIMEOUT_NAME      (sntp_opt_strs+1165)
+#define BCTIMEOUT_name      (sntp_opt_strs+1175)
 #define BCTIMEOUT_DFT_ARG   ((char const*)68)
 #define BCTIMEOUT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -214,44 +213,44 @@ static int const aIpv6CantList[] = {
 /*
  *  broadcast option description:
  */
-#define BROADCAST_DESC      (sntp_opt_strs+1266)
-#define BROADCAST_NAME      (sntp_opt_strs+1322)
-#define BROADCAST_name      (sntp_opt_strs+1332)
+#define BROADCAST_DESC      (sntp_opt_strs+1185)
+#define BROADCAST_NAME      (sntp_opt_strs+1241)
+#define BROADCAST_name      (sntp_opt_strs+1251)
 #define BROADCAST_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  concurrent option description:
  */
-#define CONCURRENT_DESC      (sntp_opt_strs+1342)
-#define CONCURRENT_NAME      (sntp_opt_strs+1392)
-#define CONCURRENT_name      (sntp_opt_strs+1403)
+#define CONCURRENT_DESC      (sntp_opt_strs+1261)
+#define CONCURRENT_NAME      (sntp_opt_strs+1311)
+#define CONCURRENT_name      (sntp_opt_strs+1322)
 #define CONCURRENT_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  debug-level option description:
  */
-#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_DESC      (sntp_opt_strs+1333)
+#define DEBUG_LEVEL_NAME      (sntp_opt_strs+1364)
+#define DEBUG_LEVEL_name      (sntp_opt_strs+1376)
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
 /*
  *  set-debug-level option description:
  */
-#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_DESC      (sntp_opt_strs+1388)
+#define SET_DEBUG_LEVEL_NAME      (sntp_opt_strs+1418)
+#define SET_DEBUG_LEVEL_name      (sntp_opt_strs+1434)
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  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_DESC      (sntp_opt_strs+1450)
+#define GAP_NAME      (sntp_opt_strs+1498)
+#define GAP_name      (sntp_opt_strs+1502)
 #define GAP_DFT_ARG   ((char const*)50)
 #define GAP_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -259,46 +258,46 @@ static int const aIpv6CantList[] = {
 /*
  *  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_DESC      (sntp_opt_strs+1506)
+#define KOD_NAME      (sntp_opt_strs+1527)
+#define KOD_name      (sntp_opt_strs+1531)
+#define KOD_DFT_ARG   (sntp_opt_strs+1535)
 #define KOD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
 
 /*
  *  keyfile option description:
  */
-#define KEYFILE_DESC      (sntp_opt_strs+1632)
-#define KEYFILE_NAME      (sntp_opt_strs+1689)
-#define KEYFILE_name      (sntp_opt_strs+1697)
+#define KEYFILE_DESC      (sntp_opt_strs+1551)
+#define KEYFILE_NAME      (sntp_opt_strs+1608)
+#define KEYFILE_name      (sntp_opt_strs+1616)
 #define KEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
 
 /*
  *  logfile option description:
  */
-#define LOGFILE_DESC      (sntp_opt_strs+1705)
-#define LOGFILE_NAME      (sntp_opt_strs+1730)
-#define LOGFILE_name      (sntp_opt_strs+1738)
+#define LOGFILE_DESC      (sntp_opt_strs+1624)
+#define LOGFILE_NAME      (sntp_opt_strs+1649)
+#define LOGFILE_name      (sntp_opt_strs+1657)
 #define LOGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_FILE))
 
 /*
  *  steplimit option description:
  */
-#define STEPLIMIT_DESC      (sntp_opt_strs+1746)
-#define STEPLIMIT_NAME      (sntp_opt_strs+1804)
-#define STEPLIMIT_name      (sntp_opt_strs+1814)
+#define STEPLIMIT_DESC      (sntp_opt_strs+1665)
+#define STEPLIMIT_NAME      (sntp_opt_strs+1723)
+#define STEPLIMIT_name      (sntp_opt_strs+1733)
 #define STEPLIMIT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
  *  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_DESC      (sntp_opt_strs+1743)
+#define NTPVERSION_NAME      (sntp_opt_strs+1777)
+#define NTPVERSION_name      (sntp_opt_strs+1788)
 #define NTPVERSION_DFT_ARG   ((char const*)4)
 #define NTPVERSION_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -306,33 +305,33 @@ static int const aIpv6CantList[] = {
 /*
  *  usereservedport option description:
  */
-#define USERESERVEDPORT_DESC      (sntp_opt_strs+1880)
-#define USERESERVEDPORT_NAME      (sntp_opt_strs+1917)
-#define USERESERVEDPORT_name      (sntp_opt_strs+1933)
+#define USERESERVEDPORT_DESC      (sntp_opt_strs+1799)
+#define USERESERVEDPORT_NAME      (sntp_opt_strs+1836)
+#define USERESERVEDPORT_name      (sntp_opt_strs+1852)
 #define USERESERVEDPORT_FLAGS     (OPTST_DISABLED)
 
 /*
  *  step option description:
  */
-#define STEP_DESC      (sntp_opt_strs+1949)
-#define STEP_NAME      (sntp_opt_strs+2002)
-#define STEP_name      (sntp_opt_strs+2007)
+#define STEP_DESC      (sntp_opt_strs+1868)
+#define STEP_NAME      (sntp_opt_strs+1921)
+#define STEP_name      (sntp_opt_strs+1926)
 #define STEP_FLAGS     (OPTST_DISABLED)
 
 /*
  *  slew option description:
  */
-#define SLEW_DESC      (sntp_opt_strs+2012)
-#define SLEW_NAME      (sntp_opt_strs+2060)
-#define SLEW_name      (sntp_opt_strs+2065)
+#define SLEW_DESC      (sntp_opt_strs+1931)
+#define SLEW_NAME      (sntp_opt_strs+1979)
+#define SLEW_name      (sntp_opt_strs+1984)
 #define SLEW_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_DESC      (sntp_opt_strs+1989)
+#define UCTIMEOUT_NAME      (sntp_opt_strs+2041)
+#define UCTIMEOUT_name      (sntp_opt_strs+2051)
 #define UCTIMEOUT_DFT_ARG   ((char const*)5)
 #define UCTIMEOUT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
@@ -340,21 +339,21 @@ static int const aIpv6CantList[] = {
 /*
  *  wait option description:
  */
-#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_DESC      (sntp_opt_strs+2061)
+#define WAIT_NAME      (sntp_opt_strs+2112)
+#define NOT_WAIT_name  (sntp_opt_strs+2117)
+#define NOT_WAIT_PFX   (sntp_opt_strs+2125)
 #define WAIT_name      (NOT_WAIT_name + 3)
 #define WAIT_FLAGS     (OPTST_INITENABLED)
 
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (sntp_opt_strs+2209)
-#define HELP_name       (sntp_opt_strs+2253)
+#define HELP_DESC       (sntp_opt_strs+2128)
+#define HELP_name       (sntp_opt_strs+2172)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (sntp_opt_strs+2258)
-#define MORE_HELP_name  (sntp_opt_strs+2303)
+#define MORE_HELP_DESC  (sntp_opt_strs+2177)
+#define MORE_HELP_name  (sntp_opt_strs+2222)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  NULL
@@ -367,14 +366,14 @@ static int const aIpv6CantList[] = {
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#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 VER_DESC        (sntp_opt_strs+2232)
+#define VER_name        (sntp_opt_strs+2268)
+#define SAVE_OPTS_DESC  (sntp_opt_strs+2276)
+#define SAVE_OPTS_name  (sntp_opt_strs+2315)
+#define LOAD_OPTS_DESC     (sntp_opt_strs+2325)
+#define LOAD_OPTS_NAME     (sntp_opt_strs+2357)
+#define NO_LOAD_OPTS_name  (sntp_opt_strs+2367)
+#define LOAD_OPTS_pfx      (sntp_opt_strs+2125)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /*
  *  Declare option callback procedures
@@ -399,10 +398,10 @@ static tOptProc
  *  When not under test, there are different procs to use
  */
 extern tOptProc
-    optionBooleanVal,    optionNestedVal,     optionNumericVal,
-    optionPagedUsage,    optionPrintVersion,  optionResetOpt,
-    optionStackArg,      optionTimeDate,      optionTimeVal,
-    optionUnstackArg,    optionVendorOption,  optionVersionStderr;
+    ntpOptionPrintVersion, optionBooleanVal,      optionNestedVal,
+    optionNumericVal,      optionPagedUsage,      optionResetOpt,
+    optionStackArg,        optionTimeDate,        optionTimeVal,
+    optionUnstackArg,      optionVendorOption,    optionVersionStderr;
 static tOptProc
     doOptKeyfile,         doOptKod,             doOptLogfile,
     doOptNtpversion,      doOptSet_Debug_Level, doOptSteplimit,
@@ -415,11 +414,7 @@ static tOptProc
 
 #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level
 #endif /* defined(TEST_SNTP_OPTS) */
-#ifdef TEST_SNTP_OPTS
-# define VER_PROC       optionVersionStderr
-#else
-# define VER_PROC       optionPrintVersion
-#endif /* TEST_SNTP_OPTS */
+#define VER_PROC        ntpOptionPrintVersion
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
@@ -724,17 +719,17 @@ static tOptDesc optDesc[OPTION_CT] = {
  *
  *  Define the Sntp Option Environment
  */
-#define zPROGNAME       (sntp_opt_strs+2461)
-#define zUsageTitle     (sntp_opt_strs+2466)
-#define zRcName         (sntp_opt_strs+2627)
+#define zPROGNAME       (sntp_opt_strs+2380)
+#define zUsageTitle     (sntp_opt_strs+2385)
+#define zRcName         (sntp_opt_strs+2546)
 static char const * const apzHomeList[3] = {
-    sntp_opt_strs+2634,
-    sntp_opt_strs+2640,
+    sntp_opt_strs+2553,
+    sntp_opt_strs+2559,
     NULL };
-#define zBugsAddr       (sntp_opt_strs+2642)
-#define zExplain        (sntp_opt_strs+2676)
+#define zBugsAddr       (sntp_opt_strs+2561)
+#define zExplain        (sntp_opt_strs+2595)
 #define zDetail         (NULL)
-#define zFullVersion    (sntp_opt_strs+2679)
+#define zFullVersion    (sntp_opt_strs+2598)
 /* extracted from optcode.tlib near line 315 */
 
 #if defined(ENABLE_NLS)
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index 4458f4cf4..6c1dadc12 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  January 25, 2012 at 12:05:08 PM by AutoGen 5.14
+ *  It has been AutoGen-ed  January 26, 2012 at 06:00:55 AM by AutoGen 5.14
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -18,20 +18,20 @@
  * 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.
+ *  Copyright (C) 1970-2012 The University of Delaware, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    
- *    
+ *    
  *
  *  Permission to use, copy, modify, and distribute this software and its
  *  documentation for any purpose with or without fee is hereby granted,
  *  provided that the above copyright notice appears in all copies and that
  *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in
+ *  supporting documentation, and that the name The University of Delaware not be used in
  *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no
+ *  without specific, written prior permission. The University of Delaware makes no
  *  representations about the suitability this software for any purpose. It
  *  is provided "as is" without express or implied warranty.
  */
@@ -91,8 +91,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define SNTP_VERSION       "4.2.7p252"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p252"
+#define SNTP_VERSION       "4.2.7p253"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p253"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 00a8ddd78..d4ead63af 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 25, 2012 at 12:05:27 PM by AutoGen 5.14
+# It has been AutoGen-ed  January 26, 2012 at 06:04:45 AM by AutoGen 5.14
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -91,7 +91,7 @@ This is the automatically generated usage text for sntp:
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p252
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p253
 USAGE:  sntp [ - [] | --[@{=| @}] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index ceb9e3b0e..b7d30625c 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "25 Jan 2012" "4.2.7p252" "User Commands"
+.TH sntp 1sntpman "26 Jan 2012" "4.2.7p253" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:24 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:42 AM by AutoGen 5.14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -297,7 +297,7 @@ The operation failed or the command syntax was not valid.
 .An "Harlan Stenn"
 .An "Dave Hart"
 .SH "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH BUGS
 Please report bugs to http://bugs.ntp.org .Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index f93c5ed30..667b876cf 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd January 25 2012
+.Dd January 26 2012
 .Dt SNTP 1sntpmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:27 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:45 AM by AutoGen 5.14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -279,7 +279,7 @@ The operation failed or the command syntax was not valid.
 .An "Harlan Stenn"
 .An "Dave Hart"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh BUGS
 Please report bugs to http://bugs.ntp.org .Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/sntp/sntp.html b/sntp/sntp.html
index dda9f4314..ed5562dcf 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.7p252 of sntp.
+  
This document applies to version 4.2.7p253 of sntp.
 
   
The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -162,7 +162,7 @@ Up: sntp Invocation
 

 This is the automatically generated usage text for sntp:
 
-
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p252
+
sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p253
 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 79c011817..ea2ddddfb 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "25 Jan 2012" "4.2.7p252" "User Commands"
+.TH sntp @SNTP_MS@ "26 Jan 2012" "4.2.7p253" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:24 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:42 AM by AutoGen 5.14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -297,7 +297,7 @@ The operation failed or the command syntax was not valid.
 .An "Harlan Stenn"
 .An "Dave Hart"
 .SH "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH BUGS
 Please report bugs to http://bugs.ntp.org .Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index 8c33e4704..a3365cd2a 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 25 2012
+.Dd January 26 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 25, 2012 at 12:05:27 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:45 AM by AutoGen 5.14
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -279,7 +279,7 @@ The operation failed or the command syntax was not valid.
 .An "Harlan Stenn"
 .An "Dave Hart"
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh BUGS
 Please report bugs to http://bugs.ntp.org .Please send bug reports to: http://bugs.ntp.org, bugs@ntp.org
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 780074b65..0b33da218 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  January 25, 2012 at 12:04:51 PM by AutoGen 5.14
+ *  It has been AutoGen-ed  January 26, 2012 at 06:04:19 AM by AutoGen 5.14
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -18,20 +18,20 @@
  * 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.
+ *  Copyright (C) 1970-2012 The University of Delaware, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    
- *    
+ *    
  *
  *  Permission to use, copy, modify, and distribute this software and its
  *  documentation for any purpose with or without fee is hereby granted,
  *  provided that the above copyright notice appears in all copies and that
  *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in
+ *  supporting documentation, and that the name The University of Delaware not be used in
  *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no
+ *  without specific, written prior permission. The University of Delaware makes no
  *  representations about the suitability this software for any purpose. It
  *  is provided "as is" without express or implied warranty.
  */
@@ -53,7 +53,7 @@ extern FILE * option_usage_fp;
 /* TRANSLATORS: choose the translation for option names wisely because you
                 cannot ever change your mind. */
 #define zCopyright      (ntp_keygen_opt_strs+0)
-#define zLicenseDescrip (ntp_keygen_opt_strs+345)
+#define zLicenseDescrip (ntp_keygen_opt_strs+326)
 
 extern tUsageProc optionUsage;
 /*
@@ -73,112 +73,111 @@ extern tUsageProc optionUsage;
 /*
  *  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"
+static char const ntp_keygen_opt_strs[2320] =
+/*     0 */ "ntp-keygen (ntp) 4.2.7p253\n"
+            "Copyright (C) 1970-2012 The University of Delaware, all rights reserved.\n"
             "This is free software. It is licensed for use, modification and\n"
             "redistribution under the terms of the NTP License, copies of which\n"
             "can be seen at:\n"
             "  \n"
-            "  \n\0"
-/*   345 */ "Permission to use, copy, modify, and distribute this software and its\n"
+            "  \n\0"
+/*   326 */ "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"
+            "documentation, and that the name The University of Delaware not be used in\n"
+            "advertising or publicity pertaining to distribution of the software\n"
+            "without specific, written prior permission. The University of Delaware\n"
+            "makes no representations about the suitability this software for any\n"
+            "purpose. It is provided \"as is\" without express or implied warranty.\n\0"
+/*   964 */ "certificate scheme\0"
+/*   983 */ "CERTIFICATE\0"
+/*   995 */ "certificate\0"
+/*  1007 */ "privatekey cipher\0"
+/*  1025 */ "CIPHER\0"
+/*  1032 */ "cipher\0"
+/*  1039 */ "Increase debug verbosity level\0"
+/*  1070 */ "DEBUG_LEVEL\0"
+/*  1082 */ "debug-level\0"
+/*  1094 */ "Set the debug verbosity level\0"
+/*  1124 */ "SET_DEBUG_LEVEL\0"
+/*  1140 */ "set-debug-level\0"
+/*  1156 */ "Write IFF or GQ identity keys\0"
+/*  1186 */ "ID_KEY\0"
+/*  1193 */ "id-key\0"
+/*  1200 */ "Generate GQ parameters and keys\0"
+/*  1232 */ "GQ_PARAMS\0"
+/*  1242 */ "gq-params\0"
+/*  1252 */ "generate RSA host key\0"
+/*  1274 */ "HOST_KEY\0"
+/*  1283 */ "host-key\0"
+/*  1292 */ "generate IFF parameters\0"
+/*  1316 */ "IFFKEY\0"
+/*  1323 */ "iffkey\0"
+/*  1330 */ "set Autokey group name\0"
+/*  1353 */ "IDENT\0"
+/*  1359 */ "ident\0"
+/*  1365 */ "set certificate lifetime\0"
+/*  1390 */ "LIFETIME\0"
+/*  1399 */ "lifetime\0"
+/*  1408 */ "generate MD5 keys\0"
+/*  1426 */ "MD5KEY\0"
+/*  1433 */ "md5key\0"
+/*  1440 */ "modulus\0"
+/*  1448 */ "MODULUS\0"
+/*  1456 */ "generate PC private certificate\0"
+/*  1488 */ "PVT_CERT\0"
+/*  1497 */ "pvt-cert\0"
+/*  1506 */ "output private password\0"
+/*  1530 */ "PVT_PASSWD\0"
+/*  1541 */ "pvt-passwd\0"
+/*  1552 */ "input private password\0"
+/*  1575 */ "GET_PVT_PASSWD\0"
+/*  1590 */ "get-pvt-passwd\0"
+/*  1605 */ "generate sign key (RSA or DSA)\0"
+/*  1636 */ "SIGN_KEY\0"
+/*  1645 */ "sign-key\0"
+/*  1654 */ "set host and optionally group name\0"
+/*  1689 */ "SUBJECT_NAME\0"
+/*  1702 */ "subject-name\0"
+/*  1715 */ "trusted certificate (TC scheme)\0"
+/*  1747 */ "TRUSTED_CERT\0"
+/*  1760 */ "trusted-cert\0"
+/*  1773 */ "generate  MV parameters\0"
+/*  1802 */ "MV_PARAMS\0"
+/*  1812 */ "mv-params\0"
+/*  1822 */ "update  MV keys\0"
+/*  1843 */ "MV_KEYS\0"
+/*  1851 */ "mv-keys\0"
+/*  1859 */ "Display extended usage information and exit\0"
+/*  1903 */ "help\0"
+/*  1908 */ "Extended usage information passed thru pager\0"
+/*  1953 */ "more-help\0"
+/*  1963 */ "Output version information and exit\0"
+/*  1999 */ "version\0"
+/*  2007 */ "Save the option state to a config file\0"
+/*  2046 */ "save-opts\0"
+/*  2056 */ "Load options from a config file\0"
+/*  2088 */ "LOAD_OPTS\0"
+/*  2098 */ "no-load-opts\0"
+/*  2111 */ "no\0"
+/*  2114 */ "NTP_KEYGEN\0"
+/*  2125 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p253\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";
+/*  2241 */ ".ntprc\0"
+/*  2248 */ "$HOME\0"
+/*  2254 */ ".\0"
+/*  2256 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  2290 */ "\n\n\0"
+/*  2293 */ "ntp-keygen (ntp) 4.2.7p253";
 
 /*
  *  certificate option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+964)
+#define CERTIFICATE_NAME      (ntp_keygen_opt_strs+983)
+#define CERTIFICATE_name      (ntp_keygen_opt_strs+995)
 #define CERTIFICATE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -193,9 +192,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  cipher option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1007)
+#define CIPHER_NAME      (ntp_keygen_opt_strs+1025)
+#define CIPHER_name      (ntp_keygen_opt_strs+1032)
 #define CIPHER_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -209,17 +208,17 @@ static char const ntp_keygen_opt_strs[2401] =
 /*
  *  debug-level option description:
  */
-#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_DESC      (ntp_keygen_opt_strs+1039)
+#define DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1070)
+#define DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1082)
 #define DEBUG_LEVEL_FLAGS     (OPTST_DISABLED)
 
 /*
  *  set-debug-level option description:
  */
-#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_DESC      (ntp_keygen_opt_strs+1094)
+#define SET_DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1124)
+#define SET_DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1140)
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -227,9 +226,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  id-key option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1156)
+#define ID_KEY_NAME      (ntp_keygen_opt_strs+1186)
+#define ID_KEY_name      (ntp_keygen_opt_strs+1193)
 #define ID_KEY_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable id-key */
@@ -243,9 +242,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  gq-params option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1200)
+#define GQ_PARAMS_NAME      (ntp_keygen_opt_strs+1232)
+#define GQ_PARAMS_name      (ntp_keygen_opt_strs+1242)
 #define GQ_PARAMS_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable gq-params */
@@ -259,9 +258,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  host-key option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1252)
+#define HOST_KEY_NAME      (ntp_keygen_opt_strs+1274)
+#define HOST_KEY_name      (ntp_keygen_opt_strs+1283)
 #define HOST_KEY_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable host-key */
@@ -275,9 +274,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  iffkey option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1292)
+#define IFFKEY_NAME      (ntp_keygen_opt_strs+1316)
+#define IFFKEY_name      (ntp_keygen_opt_strs+1323)
 #define IFFKEY_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable iffkey */
@@ -291,9 +290,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  ident option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1330)
+#define IDENT_NAME      (ntp_keygen_opt_strs+1353)
+#define IDENT_name      (ntp_keygen_opt_strs+1359)
 #define IDENT_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -308,9 +307,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  lifetime option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1365)
+#define LIFETIME_NAME      (ntp_keygen_opt_strs+1390)
+#define LIFETIME_name      (ntp_keygen_opt_strs+1399)
 #define LIFETIME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
@@ -324,18 +323,18 @@ static char const ntp_keygen_opt_strs[2401] =
 /*
  *  md5key option description:
  */
-#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_DESC      (ntp_keygen_opt_strs+1408)
+#define MD5KEY_NAME      (ntp_keygen_opt_strs+1426)
+#define MD5KEY_name      (ntp_keygen_opt_strs+1433)
 #define MD5KEY_FLAGS     (OPTST_DISABLED)
 
 /*
  *  modulus option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1440)
+#define MODULUS_NAME      (ntp_keygen_opt_strs+1448)
+#define MODULUS_name      (ntp_keygen_opt_strs+1440)
 #define MODULUS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
@@ -350,9 +349,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  pvt-cert option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1456)
+#define PVT_CERT_NAME      (ntp_keygen_opt_strs+1488)
+#define PVT_CERT_name      (ntp_keygen_opt_strs+1497)
 #define PVT_CERT_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable pvt-cert */
@@ -366,9 +365,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  pvt-passwd option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1506)
+#define PVT_PASSWD_NAME      (ntp_keygen_opt_strs+1530)
+#define PVT_PASSWD_name      (ntp_keygen_opt_strs+1541)
 #define PVT_PASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -383,9 +382,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  get-pvt-passwd option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1552)
+#define GET_PVT_PASSWD_NAME      (ntp_keygen_opt_strs+1575)
+#define GET_PVT_PASSWD_name      (ntp_keygen_opt_strs+1590)
 #define GET_PVT_PASSWD_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -400,9 +399,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  sign-key option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1605)
+#define SIGN_KEY_NAME      (ntp_keygen_opt_strs+1636)
+#define SIGN_KEY_name      (ntp_keygen_opt_strs+1645)
 #define SIGN_KEY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -417,9 +416,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  subject-name option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1654)
+#define SUBJECT_NAME_NAME      (ntp_keygen_opt_strs+1689)
+#define SUBJECT_NAME_name      (ntp_keygen_opt_strs+1702)
 #define SUBJECT_NAME_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -434,9 +433,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  trusted-cert option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1715)
+#define TRUSTED_CERT_NAME      (ntp_keygen_opt_strs+1747)
+#define TRUSTED_CERT_name      (ntp_keygen_opt_strs+1760)
 #define TRUSTED_CERT_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable trusted-cert */
@@ -450,9 +449,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  mv-params option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1773)
+#define MV_PARAMS_NAME      (ntp_keygen_opt_strs+1802)
+#define MV_PARAMS_name      (ntp_keygen_opt_strs+1812)
 #define MV_PARAMS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
@@ -467,9 +466,9 @@ static char const ntp_keygen_opt_strs[2401] =
  *  mv-keys option description:
  */
 #ifdef AUTOKEY
-#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_DESC      (ntp_keygen_opt_strs+1822)
+#define MV_KEYS_NAME      (ntp_keygen_opt_strs+1843)
+#define MV_KEYS_name      (ntp_keygen_opt_strs+1851)
 #define MV_KEYS_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
@@ -483,11 +482,11 @@ static char const ntp_keygen_opt_strs[2401] =
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntp_keygen_opt_strs+1940)
-#define HELP_name       (ntp_keygen_opt_strs+1984)
+#define HELP_DESC       (ntp_keygen_opt_strs+1859)
+#define HELP_name       (ntp_keygen_opt_strs+1903)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntp_keygen_opt_strs+1989)
-#define MORE_HELP_name  (ntp_keygen_opt_strs+2034)
+#define MORE_HELP_DESC  (ntp_keygen_opt_strs+1908)
+#define MORE_HELP_name  (ntp_keygen_opt_strs+1953)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  NULL
@@ -500,14 +499,14 @@ static char const ntp_keygen_opt_strs[2401] =
 #  define VER_FLAGS     (OPTST_SET_ARGTYPE(OPARG_TYPE_STRING) | \
                          OPTST_ARG_OPTIONAL | OPTST_IMM | OPTST_NO_INIT)
 #endif
-#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 VER_DESC        (ntp_keygen_opt_strs+1963)
+#define VER_name        (ntp_keygen_opt_strs+1999)
+#define SAVE_OPTS_DESC  (ntp_keygen_opt_strs+2007)
+#define SAVE_OPTS_name  (ntp_keygen_opt_strs+2046)
+#define LOAD_OPTS_DESC     (ntp_keygen_opt_strs+2056)
+#define LOAD_OPTS_NAME     (ntp_keygen_opt_strs+2088)
+#define NO_LOAD_OPTS_name  (ntp_keygen_opt_strs+2098)
+#define LOAD_OPTS_pfx      (ntp_keygen_opt_strs+2111)
 #define LOAD_OPTS_name     (NO_LOAD_OPTS_name + 3)
 /*
  *  Declare option callback procedures
@@ -536,10 +535,10 @@ static tOptProc
  *  When not under test, there are different procs to use
  */
 extern tOptProc
-    optionBooleanVal,    optionNestedVal,     optionNumericVal,
-    optionPagedUsage,    optionPrintVersion,  optionResetOpt,
-    optionStackArg,      optionTimeDate,      optionTimeVal,
-    optionUnstackArg,    optionVendorOption,  optionVersionStderr;
+    ntpOptionPrintVersion, optionBooleanVal,      optionNestedVal,
+    optionNumericVal,      optionPagedUsage,      optionResetOpt,
+    optionStackArg,        optionTimeDate,        optionTimeVal,
+    optionUnstackArg,      optionVendorOption,    optionVersionStderr;
 static tOptProc
     doOptSet_Debug_Level, doUsageOpt;
 
@@ -550,11 +549,7 @@ static tOptProc
 
 #define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level
 #endif /* defined(TEST_NTP_KEYGEN_OPTS) */
-#ifdef TEST_NTP_KEYGEN_OPTS
-# define VER_PROC       optionVersionStderr
-#else
-# define VER_PROC       optionPrintVersion
-#endif /* TEST_NTP_KEYGEN_OPTS */
+#define VER_PROC        ntpOptionPrintVersion
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
  *
@@ -871,17 +866,17 @@ static tOptDesc optDesc[OPTION_CT] = {
  *
  *  Define the Ntp_Keygen Option Environment
  */
-#define zPROGNAME       (ntp_keygen_opt_strs+2195)
-#define zUsageTitle     (ntp_keygen_opt_strs+2206)
-#define zRcName         (ntp_keygen_opt_strs+2322)
+#define zPROGNAME       (ntp_keygen_opt_strs+2114)
+#define zUsageTitle     (ntp_keygen_opt_strs+2125)
+#define zRcName         (ntp_keygen_opt_strs+2241)
 static char const * const apzHomeList[3] = {
-    ntp_keygen_opt_strs+2329,
-    ntp_keygen_opt_strs+2335,
+    ntp_keygen_opt_strs+2248,
+    ntp_keygen_opt_strs+2254,
     NULL };
-#define zBugsAddr       (ntp_keygen_opt_strs+2337)
-#define zExplain        (ntp_keygen_opt_strs+2371)
+#define zBugsAddr       (ntp_keygen_opt_strs+2256)
+#define zExplain        (ntp_keygen_opt_strs+2290)
 #define zDetail         (NULL)
-#define zFullVersion    (ntp_keygen_opt_strs+2374)
+#define zFullVersion    (ntp_keygen_opt_strs+2293)
 /* extracted from optcode.tlib near line 315 */
 
 #if defined(ENABLE_NLS)
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 09e9ea85d..c7a99effa 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -1,7 +1,7 @@
 /*  
  *  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  January 25, 2012 at 12:04:50 PM by AutoGen 5.14
+ *  It has been AutoGen-ed  January 26, 2012 at 06:04:19 AM by AutoGen 5.14
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -18,20 +18,20 @@
  * 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.
+ *  Copyright (C) 1970-2012 The University of Delaware, all rights reserved.
  *  This is free software. It is licensed for use, modification and
  *  redistribution under the terms of the NTP License, copies of which
  *  can be seen at:
  *    
- *    
+ *    
  *
  *  Permission to use, copy, modify, and distribute this software and its
  *  documentation for any purpose with or without fee is hereby granted,
  *  provided that the above copyright notice appears in all copies and that
  *  both the copyright notice and this permission notice appear in
- *  supporting documentation, and that the name The University of Delaware, David L. Mills, and/or others not be used in
+ *  supporting documentation, and that the name The University of Delaware not be used in
  *  advertising or publicity pertaining to distribution of the software
- *  without specific, written prior permission. The University of Delaware, David L. Mills, and/or others makes no
+ *  without specific, written prior permission. The University of Delaware makes no
  *  representations about the suitability this software for any purpose. It
  *  is provided "as is" without express or implied warranty.
  */
@@ -92,8 +92,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    25
-#define NTP_KEYGEN_VERSION       "4.2.7p252"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p252"
+#define NTP_KEYGEN_VERSION       "4.2.7p253"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p253"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index e013ca690..1ce7aa7c1 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 25, 2012 at 12:05:07 PM by AutoGen 5.14
+# It has been AutoGen-ed  January 26, 2012 at 06:04:32 AM by AutoGen 5.14
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -50,7 +50,7 @@ This is the automatically generated usage text for ntp-keygen:
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p252
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p253
 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 358b0afd5..eb6654a48 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "25 Jan 2012" "ntp (4.2.7p252)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "26 Jan 2012" "ntp (4.2.7p253)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:03 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:29 AM by AutoGen 5.14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -921,9 +921,9 @@ Successful program execution.
 .BR 1
 The operation failed or the command syntax was not valid.
 .SH "AUTHORS"
-The University of Delaware, David L. Mills, and/or others
+The University of Delaware
 .SH "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH BUGS
 It can take quite a while to generate some cryptographic values,
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index f5faa4125..679046cf7 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd January 25 2012
+.Dd January 26 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 25, 2012 at 12:05:07 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:33 AM by AutoGen 5.14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -887,9 +887,9 @@ Successful program execution.
 The operation failed or the command syntax was not valid.
 .El
 .Sh "AUTHORS"
-The University of Delaware, David L. Mills, and/or others
+The University of Delaware
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh BUGS
 It can take quite a while to generate some cryptographic values,
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index 4a7e35524..16461c6df 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "25 Jan 2012" "ntp (4.2.7p252)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "26 Jan 2012" "ntp (4.2.7p253)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  January 25, 2012 at 12:05:03 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:29 AM by AutoGen 5.14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -921,9 +921,9 @@ Successful program execution.
 .BR 1
 The operation failed or the command syntax was not valid.
 .SH "AUTHORS"
-The University of Delaware, David L. Mills, and/or others
+The University of Delaware
 .SH "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .SH BUGS
 It can take quite a while to generate some cryptographic values,
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index b67a89793..33a7a71b7 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd January 25 2012
+.Dd January 26 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 25, 2012 at 12:05:07 PM by AutoGen 5.14
+.\"  It has been AutoGen-ed  January 26, 2012 at 06:04:33 AM by AutoGen 5.14
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -887,9 +887,9 @@ Successful program execution.
 The operation failed or the command syntax was not valid.
 .El
 .Sh "AUTHORS"
-The University of Delaware, David L. Mills, and/or others
+The University of Delaware
 .Sh "COPYRIGHT"
-Copyright (C) 1970-2012 The University of Delaware, David L. Mills, and/or others all rights reserved.
+Copyright (C) 1970-2012 The University of Delaware all rights reserved.
 This program is released under the terms of the NTP license, .
 .Sh BUGS
 It can take quite a while to generate some cryptographic values,