From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 10 Oct 2012 06:30:54 +0000 (+0000)
Subject: NTP_4_2_7P311
X-Git-Tag: NTP_4_2_7P311^0
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=89801a07c00965e9aaefdbdb472745b04f90fd02;p=thirdparty%2Fntp.git

NTP_4_2_7P311

bk: 5075161eK8rrg40wL6EnifDyLTDf0Q
---

diff --git a/ChangeLog b/ChangeLog
index b56988b70..0cc671621 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,4 @@
+(4.2.7p311) 2012/10/10 Released by Harlan Stenn <stenn@ntp.org>
 * [Bug 938] The argument to the -D flag takes a number, not a string.
 * [Bug 1013] ntpdate's HTML page claims wrong default version.
 * [Bug 1374] Support SO_TIMESTAMPNS.
diff --git a/ntpd/invoke-ntpd.texi b/ntpd/invoke-ntpd.texi
index 93112b617..8c199419b 100644
--- a/ntpd/invoke-ntpd.texi
+++ b/ntpd/invoke-ntpd.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpd.texi)
 # 
-# It has been AutoGen-ed  October  9, 2012 at 11:39:14 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  October 10, 2012 at 06:28:18 AM by AutoGen 5.16.2
 # From the definitions    ntpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -92,8 +92,6 @@ This software is released under the NTP license, <http://ntp.org/license>.
 * ntpd authreq::                authreq option (-a)
 * ntpd authnoreq::              authnoreq option (-A)
 * ntpd configfile::             configfile option (-c)
-* ntpd debug-level::            debug-level option (-d)
-* ntpd set-debug-level::        set-debug-level option (-D)
 * ntpd driftfile::              driftfile option (-f)
 * ntpd panicgate::              panicgate option (-g)
 * ntpd jaildir::                jaildir option (-i)
@@ -142,7 +140,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpd - NTP daemon program - Ver. 4.2.7p310
+ntpd - NTP daemon program - Ver. 4.2.7p311
 USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ <server1> ... <serverN> ]
   Flg Arg Option-Name    Description
@@ -160,9 +158,9 @@ USAGE:  ntpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                                 authreq
    -b no  bcastsync      Allow us to sync to broadcast servers
    -c Str configfile     configuration file name
-   -d no  debug-level    Increase output debug message level
+   -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the output debug message level
+   -D Num set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -f Str driftfile      frequency drift file name
    -g no  panicgate      Allow the first adjustment to be Big
@@ -294,40 +292,6 @@ This option takes an argument string.
 The name and path of the configuration file,
 /etc/ntp.conf
 by default.
-@node ntpd debug-level
-@subsection debug-level option (-d)
-@cindex ntpd-debug-level
-
-This is the ``increase output debug message level'' option.
-
-@noindent
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-may appear an unlimited number of times.
-@item
-must be compiled in by defining @code{DEBUG} during the compilation.
-@end itemize
-
-Increase the debugging message output level.
-@node ntpd set-debug-level
-@subsection set-debug-level option (-D)
-@cindex ntpd-set-debug-level
-
-This is the ``set the output debug message level'' option.
-This option takes an argument string.
-
-@noindent
-This option has some usage constraints.  It:
-@itemize @bullet
-@item
-may appear an unlimited number of times.
-@item
-must be compiled in by defining @code{DEBUG} during the compilation.
-@end itemize
-
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
 @node ntpd driftfile
 @subsection driftfile option (-f)
 @cindex ntpd-driftfile
diff --git a/ntpd/ntp.conf.5man b/ntpd/ntp.conf.5man
index d8ca8d91a..8f9016812 100644
--- a/ntpd/ntp.conf.5man
+++ b/ntpd/ntp.conf.5man
@@ -1,8 +1,8 @@
-.TH ntp.conf 5man "09 Oct 2012" "4.2.7p310" "File Formats"
+.TH ntp.conf 5man "10 Oct 2012" "4.2.7p311" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:02 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:05 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpd/ntp.conf.5mdoc b/ntpd/ntp.conf.5mdoc
index ee1099fed..3b9a859de 100644
--- a/ntpd/ntp.conf.5mdoc
+++ b/ntpd/ntp.conf.5mdoc
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTP_CONF 5mdoc File Formats
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:17 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:20 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpd/ntp.conf.man.in b/ntpd/ntp.conf.man.in
index ba4893810..0b8734697 100644
--- a/ntpd/ntp.conf.man.in
+++ b/ntpd/ntp.conf.man.in
@@ -1,8 +1,8 @@
-.TH ntp.conf 5 "09 Oct 2012" "4.2.7p310" "File Formats"
+.TH ntp.conf 5 "10 Oct 2012" "4.2.7p311" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:02 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:05 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpd/ntp.conf.mdoc.in b/ntpd/ntp.conf.mdoc.in
index 0451ae871..3b9dab6e0 100644
--- a/ntpd/ntp.conf.mdoc.in
+++ b/ntpd/ntp.conf.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTP_CONF 5 File Formats
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:17 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:20 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp.conf.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpd/ntp.keys.5man b/ntpd/ntp.keys.5man
index 31b725c70..c95f7be57 100644
--- a/ntpd/ntp.keys.5man
+++ b/ntpd/ntp.keys.5man
@@ -1,8 +1,8 @@
-.TH ntp.keys 5man "09 Oct 2012" "4.2.7p310" "File Formats"
+.TH ntp.keys 5man "10 Oct 2012" "4.2.7p311" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:05 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:09 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpd/ntp.keys.5mdoc b/ntpd/ntp.keys.5mdoc
index c97859553..2fb8405a0 100644
--- a/ntpd/ntp.keys.5mdoc
+++ b/ntpd/ntp.keys.5mdoc
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTP_KEYS 5mdoc File Formats
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:19 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:22 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpd/ntp.keys.man.in b/ntpd/ntp.keys.man.in
index 50e60c68d..e587fafa9 100644
--- a/ntpd/ntp.keys.man.in
+++ b/ntpd/ntp.keys.man.in
@@ -1,8 +1,8 @@
-.TH ntp.keys 5 "09 Oct 2012" "4.2.7p310" "File Formats"
+.TH ntp.keys 5 "10 Oct 2012" "4.2.7p311" "File Formats"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:05 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:09 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpd/ntp.keys.mdoc.in b/ntpd/ntp.keys.mdoc.in
index ea7f6afd4..78d661a72 100644
--- a/ntpd/ntp.keys.mdoc.in
+++ b/ntpd/ntp.keys.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTP_KEYS 5 File Formats
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntp.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:19 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:22 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp.keys.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index ad18951cc..42d575d33 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  October  9, 2012 at 11:38:04 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:26:54 AM by AutoGen 5.16.2
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -64,6 +64,12 @@ extern FILE * option_usage_fp;
 # include <stdlib.h>
 #endif
 
+#ifdef __windows
+  extern int atoi(const char*);
+#else
+# include <stdlib.h>
+#endif
+
 #ifndef NULL
 #  define NULL 0
 #endif
@@ -71,8 +77,8 @@ extern FILE * option_usage_fp;
 /*
  *  ntpd option static const strings
  */
-static char const ntpd_opt_strs[3055] =
-/*     0 */ "ntpd 4.2.7p310\n"
+static char const ntpd_opt_strs[2987] =
+/*     0 */ "ntpd 4.2.7p311\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"
@@ -106,105 +112,104 @@ static char const ntpd_opt_strs[3055] =
 /*  1197 */ "configuration file name\0"
 /*  1221 */ "CONFIGFILE\0"
 /*  1232 */ "configfile\0"
-/*  1243 */ "Increase output debug message level\0"
-/*  1279 */ "DEBUG_LEVEL\0"
-/*  1291 */ "debug-level\0"
-/*  1303 */ "this package was built using 'configure --disable--debug'\0"
-/*  1361 */ "Set the output debug message level\0"
-/*  1396 */ "SET_DEBUG_LEVEL\0"
-/*  1412 */ "set-debug-level\0"
-/*  1428 */ "frequency drift file name\0"
-/*  1454 */ "DRIFTFILE\0"
-/*  1464 */ "driftfile\0"
-/*  1474 */ "Allow the first adjustment to be Big\0"
-/*  1511 */ "PANICGATE\0"
-/*  1521 */ "panicgate\0"
-/*  1531 */ "Jail directory\0"
-/*  1546 */ "JAILDIR\0"
-/*  1554 */ "jaildir\0"
-/*  1562 */ "built without --enable-clockctl or --enable-linuxcaps\0"
-/*  1616 */ "Listen on an interface name or address\0"
-/*  1655 */ "INTERFACE\0"
-/*  1665 */ "interface\0"
-/*  1675 */ "path to symmetric keys\0"
-/*  1698 */ "KEYFILE\0"
-/*  1706 */ "keyfile\0"
-/*  1714 */ "path to the log file\0"
-/*  1735 */ "LOGFILE\0"
-/*  1743 */ "logfile\0"
-/*  1751 */ "Do not listen to virtual interfaces\0"
-/*  1787 */ "NOVIRTUALIPS\0"
-/*  1800 */ "novirtualips\0"
-/*  1813 */ "Modify Multimedia Timer (Windows only)\0"
-/*  1852 */ "MODIFYMMTIMER\0"
-/*  1866 */ "modifymmtimer\0"
-/*  1880 */ "Do not fork\0"
-/*  1892 */ "NOFORK\0"
-/*  1899 */ "nofork\0"
-/*  1906 */ "Run at high priority\0"
-/*  1927 */ "NICE\0"
-/*  1932 */ "nice\0"
-/*  1937 */ "path to the PID file\0"
-/*  1958 */ "PIDFILE\0"
-/*  1966 */ "pidfile\0"
-/*  1974 */ "Process priority\0"
-/*  1991 */ "PRIORITY\0"
-/*  2000 */ "priority\0"
-/*  2009 */ "Set the time and quit\0"
-/*  2031 */ "QUIT\0"
-/*  2036 */ "quit\0"
-/*  2041 */ "Broadcast/propagation delay\0"
-/*  2069 */ "PROPAGATIONDELAY\0"
-/*  2086 */ "propagationdelay\0"
-/*  2103 */ "Save parsed configuration and quit\0"
-/*  2138 */ "SAVECONFIGQUIT\0"
-/*  2153 */ "saveconfigquit\0"
-/*  2168 */ "Statistics file location\0"
-/*  2193 */ "STATSDIR\0"
-/*  2202 */ "statsdir\0"
-/*  2211 */ "Trusted key number\0"
-/*  2230 */ "TRUSTEDKEY\0"
-/*  2241 */ "trustedkey\0"
-/*  2252 */ "Run as userid (or userid:groupid)\0"
-/*  2286 */ "USER\0"
-/*  2291 */ "user\0"
-/*  2296 */ "interval in seconds between scans for new or dropped interfaces\0"
-/*  2360 */ "UPDATEINTERVAL\0"
-/*  2375 */ "updateinterval\0"
-/*  2390 */ "make ARG an ntp variable (RW)\0"
-/*  2420 */ "VAR\0"
-/*  2424 */ "var\0"
-/*  2428 */ "make ARG an ntp variable (RW|DEF)\0"
-/*  2462 */ "DVAR\0"
-/*  2467 */ "dvar\0"
-/*  2472 */ "Seconds to wait for first clock sync\0"
-/*  2509 */ "WAIT_SYNC\0"
-/*  2519 */ "wait-sync\0"
-/*  2529 */ "Slew up to 600 seconds\0"
-/*  2552 */ "SLEW\0"
-/*  2557 */ "slew\0"
-/*  2562 */ "Use CPU cycle counter (Windows only)\0"
-/*  2599 */ "USEPCC\0"
-/*  2606 */ "usepcc\0"
-/*  2613 */ "Force CPU cycle counter use (Windows only)\0"
-/*  2656 */ "PCCFREQ\0"
-/*  2664 */ "pccfreq\0"
-/*  2672 */ "Register with mDNS as a NTP server\0"
-/*  2707 */ "MDNS\0"
-/*  2712 */ "mdns\0"
-/*  2717 */ "Display extended usage information and exit\0"
-/*  2761 */ "help\0"
-/*  2766 */ "Extended usage information passed thru pager\0"
-/*  2811 */ "more-help\0"
-/*  2821 */ "Output version information and exit\0"
-/*  2857 */ "version\0"
-/*  2865 */ "NTPD\0"
-/*  2870 */ "ntpd - NTP daemon program - Ver. 4.2.7p310\n"
+/*  1243 */ "Increase debug verbosity level\0"
+/*  1274 */ "DEBUG_LEVEL\0"
+/*  1286 */ "debug-level\0"
+/*  1298 */ "Set the debug verbosity level\0"
+/*  1328 */ "SET_DEBUG_LEVEL\0"
+/*  1344 */ "set-debug-level\0"
+/*  1360 */ "frequency drift file name\0"
+/*  1386 */ "DRIFTFILE\0"
+/*  1396 */ "driftfile\0"
+/*  1406 */ "Allow the first adjustment to be Big\0"
+/*  1443 */ "PANICGATE\0"
+/*  1453 */ "panicgate\0"
+/*  1463 */ "Jail directory\0"
+/*  1478 */ "JAILDIR\0"
+/*  1486 */ "jaildir\0"
+/*  1494 */ "built without --enable-clockctl or --enable-linuxcaps\0"
+/*  1548 */ "Listen on an interface name or address\0"
+/*  1587 */ "INTERFACE\0"
+/*  1597 */ "interface\0"
+/*  1607 */ "path to symmetric keys\0"
+/*  1630 */ "KEYFILE\0"
+/*  1638 */ "keyfile\0"
+/*  1646 */ "path to the log file\0"
+/*  1667 */ "LOGFILE\0"
+/*  1675 */ "logfile\0"
+/*  1683 */ "Do not listen to virtual interfaces\0"
+/*  1719 */ "NOVIRTUALIPS\0"
+/*  1732 */ "novirtualips\0"
+/*  1745 */ "Modify Multimedia Timer (Windows only)\0"
+/*  1784 */ "MODIFYMMTIMER\0"
+/*  1798 */ "modifymmtimer\0"
+/*  1812 */ "Do not fork\0"
+/*  1824 */ "NOFORK\0"
+/*  1831 */ "nofork\0"
+/*  1838 */ "Run at high priority\0"
+/*  1859 */ "NICE\0"
+/*  1864 */ "nice\0"
+/*  1869 */ "path to the PID file\0"
+/*  1890 */ "PIDFILE\0"
+/*  1898 */ "pidfile\0"
+/*  1906 */ "Process priority\0"
+/*  1923 */ "PRIORITY\0"
+/*  1932 */ "priority\0"
+/*  1941 */ "Set the time and quit\0"
+/*  1963 */ "QUIT\0"
+/*  1968 */ "quit\0"
+/*  1973 */ "Broadcast/propagation delay\0"
+/*  2001 */ "PROPAGATIONDELAY\0"
+/*  2018 */ "propagationdelay\0"
+/*  2035 */ "Save parsed configuration and quit\0"
+/*  2070 */ "SAVECONFIGQUIT\0"
+/*  2085 */ "saveconfigquit\0"
+/*  2100 */ "Statistics file location\0"
+/*  2125 */ "STATSDIR\0"
+/*  2134 */ "statsdir\0"
+/*  2143 */ "Trusted key number\0"
+/*  2162 */ "TRUSTEDKEY\0"
+/*  2173 */ "trustedkey\0"
+/*  2184 */ "Run as userid (or userid:groupid)\0"
+/*  2218 */ "USER\0"
+/*  2223 */ "user\0"
+/*  2228 */ "interval in seconds between scans for new or dropped interfaces\0"
+/*  2292 */ "UPDATEINTERVAL\0"
+/*  2307 */ "updateinterval\0"
+/*  2322 */ "make ARG an ntp variable (RW)\0"
+/*  2352 */ "VAR\0"
+/*  2356 */ "var\0"
+/*  2360 */ "make ARG an ntp variable (RW|DEF)\0"
+/*  2394 */ "DVAR\0"
+/*  2399 */ "dvar\0"
+/*  2404 */ "Seconds to wait for first clock sync\0"
+/*  2441 */ "WAIT_SYNC\0"
+/*  2451 */ "wait-sync\0"
+/*  2461 */ "Slew up to 600 seconds\0"
+/*  2484 */ "SLEW\0"
+/*  2489 */ "slew\0"
+/*  2494 */ "Use CPU cycle counter (Windows only)\0"
+/*  2531 */ "USEPCC\0"
+/*  2538 */ "usepcc\0"
+/*  2545 */ "Force CPU cycle counter use (Windows only)\0"
+/*  2588 */ "PCCFREQ\0"
+/*  2596 */ "pccfreq\0"
+/*  2604 */ "Register with mDNS as a NTP server\0"
+/*  2639 */ "MDNS\0"
+/*  2644 */ "mdns\0"
+/*  2649 */ "Display extended usage information and exit\0"
+/*  2693 */ "help\0"
+/*  2698 */ "Extended usage information passed thru pager\0"
+/*  2743 */ "more-help\0"
+/*  2753 */ "Output version information and exit\0"
+/*  2789 */ "version\0"
+/*  2797 */ "NTPD\0"
+/*  2802 */ "ntpd - NTP daemon program - Ver. 4.2.7p311\n"
             "USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
             "\t\t[ <server1> ... <serverN> ]\n\0"
-/*  3003 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  3037 */ "\n\n\0"
-/*  3040 */ "ntpd 4.2.7p310";
+/*  2935 */ "http://bugs.ntp.org, bugs@ntp.org\0"
+/*  2969 */ "\n\n\0"
+/*  2972 */ "ntpd 4.2.7p311";
 
 /*
  *  ipv4 option description with
@@ -270,112 +275,96 @@ static int const aAuthnoreqCantList[] = {
 /*
  *  debug-level option description:
  */
-#ifdef DEBUG
 #define DEBUG_LEVEL_DESC      (ntpd_opt_strs+1243)
-#define DEBUG_LEVEL_NAME      (ntpd_opt_strs+1279)
-#define DEBUG_LEVEL_name      (ntpd_opt_strs+1291)
+#define DEBUG_LEVEL_NAME      (ntpd_opt_strs+1274)
+#define DEBUG_LEVEL_name      (ntpd_opt_strs+1286)
 #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+1303)
-#define DEBUG_LEVEL_name      (ntpd_opt_strs+1291)
-#endif  /* DEBUG */
-
 /*
  *  set-debug-level option description:
  */
-#ifdef DEBUG
-#define SET_DEBUG_LEVEL_DESC      (ntpd_opt_strs+1361)
-#define SET_DEBUG_LEVEL_NAME      (ntpd_opt_strs+1396)
-#define SET_DEBUG_LEVEL_name      (ntpd_opt_strs+1412)
+#define SET_DEBUG_LEVEL_DESC      (ntpd_opt_strs+1298)
+#define SET_DEBUG_LEVEL_NAME      (ntpd_opt_strs+1328)
+#define SET_DEBUG_LEVEL_name      (ntpd_opt_strs+1344)
 #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+1303)
-#define SET_DEBUG_LEVEL_name      (ntpd_opt_strs+1412)
-#endif  /* DEBUG */
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
  *  driftfile option description:
  */
-#define DRIFTFILE_DESC      (ntpd_opt_strs+1428)
-#define DRIFTFILE_NAME      (ntpd_opt_strs+1454)
-#define DRIFTFILE_name      (ntpd_opt_strs+1464)
+#define DRIFTFILE_DESC      (ntpd_opt_strs+1360)
+#define DRIFTFILE_NAME      (ntpd_opt_strs+1386)
+#define DRIFTFILE_name      (ntpd_opt_strs+1396)
 #define DRIFTFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  panicgate option description:
  */
-#define PANICGATE_DESC      (ntpd_opt_strs+1474)
-#define PANICGATE_NAME      (ntpd_opt_strs+1511)
-#define PANICGATE_name      (ntpd_opt_strs+1521)
+#define PANICGATE_DESC      (ntpd_opt_strs+1406)
+#define PANICGATE_NAME      (ntpd_opt_strs+1443)
+#define PANICGATE_name      (ntpd_opt_strs+1453)
 #define PANICGATE_FLAGS     (OPTST_DISABLED)
 
 /*
  *  jaildir option description:
  */
 #ifdef HAVE_DROPROOT
-#define JAILDIR_DESC      (ntpd_opt_strs+1531)
-#define JAILDIR_NAME      (ntpd_opt_strs+1546)
-#define JAILDIR_name      (ntpd_opt_strs+1554)
+#define JAILDIR_DESC      (ntpd_opt_strs+1463)
+#define JAILDIR_NAME      (ntpd_opt_strs+1478)
+#define JAILDIR_name      (ntpd_opt_strs+1486)
 #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+1562)
-#define JAILDIR_name      (ntpd_opt_strs+1554)
+#define JAILDIR_DESC      (ntpd_opt_strs+1494)
+#define JAILDIR_name      (ntpd_opt_strs+1486)
 #endif  /* HAVE_DROPROOT */
 
 /*
  *  interface option description:
  */
-#define INTERFACE_DESC      (ntpd_opt_strs+1616)
-#define INTERFACE_NAME      (ntpd_opt_strs+1655)
-#define INTERFACE_name      (ntpd_opt_strs+1665)
+#define INTERFACE_DESC      (ntpd_opt_strs+1548)
+#define INTERFACE_NAME      (ntpd_opt_strs+1587)
+#define INTERFACE_name      (ntpd_opt_strs+1597)
 #define INTERFACE_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  keyfile option description:
  */
-#define KEYFILE_DESC      (ntpd_opt_strs+1675)
-#define KEYFILE_NAME      (ntpd_opt_strs+1698)
-#define KEYFILE_name      (ntpd_opt_strs+1706)
+#define KEYFILE_DESC      (ntpd_opt_strs+1607)
+#define KEYFILE_NAME      (ntpd_opt_strs+1630)
+#define KEYFILE_name      (ntpd_opt_strs+1638)
 #define KEYFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  logfile option description:
  */
-#define LOGFILE_DESC      (ntpd_opt_strs+1714)
-#define LOGFILE_NAME      (ntpd_opt_strs+1735)
-#define LOGFILE_name      (ntpd_opt_strs+1743)
+#define LOGFILE_DESC      (ntpd_opt_strs+1646)
+#define LOGFILE_NAME      (ntpd_opt_strs+1667)
+#define LOGFILE_name      (ntpd_opt_strs+1675)
 #define LOGFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  novirtualips option description:
  */
-#define NOVIRTUALIPS_DESC      (ntpd_opt_strs+1751)
-#define NOVIRTUALIPS_NAME      (ntpd_opt_strs+1787)
-#define NOVIRTUALIPS_name      (ntpd_opt_strs+1800)
+#define NOVIRTUALIPS_DESC      (ntpd_opt_strs+1683)
+#define NOVIRTUALIPS_NAME      (ntpd_opt_strs+1719)
+#define NOVIRTUALIPS_name      (ntpd_opt_strs+1732)
 #define NOVIRTUALIPS_FLAGS     (OPTST_DISABLED)
 
 /*
  *  modifymmtimer option description:
  */
 #ifdef SYS_WINNT
-#define MODIFYMMTIMER_DESC      (ntpd_opt_strs+1813)
-#define MODIFYMMTIMER_NAME      (ntpd_opt_strs+1852)
-#define MODIFYMMTIMER_name      (ntpd_opt_strs+1866)
+#define MODIFYMMTIMER_DESC      (ntpd_opt_strs+1745)
+#define MODIFYMMTIMER_NAME      (ntpd_opt_strs+1784)
+#define MODIFYMMTIMER_name      (ntpd_opt_strs+1798)
 #define MODIFYMMTIMER_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable modifymmtimer */
@@ -389,9 +378,9 @@ static int const aAuthnoreqCantList[] = {
  *  nofork option description with
  *  "Must also have options" and "Incompatible options":
  */
-#define NOFORK_DESC      (ntpd_opt_strs+1880)
-#define NOFORK_NAME      (ntpd_opt_strs+1892)
-#define NOFORK_name      (ntpd_opt_strs+1899)
+#define NOFORK_DESC      (ntpd_opt_strs+1812)
+#define NOFORK_NAME      (ntpd_opt_strs+1824)
+#define NOFORK_name      (ntpd_opt_strs+1831)
 static int const aNoforkCantList[] = {
     INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT };
 #define NOFORK_FLAGS     (OPTST_DISABLED)
@@ -399,26 +388,26 @@ static int const aNoforkCantList[] = {
 /*
  *  nice option description:
  */
-#define NICE_DESC      (ntpd_opt_strs+1906)
-#define NICE_NAME      (ntpd_opt_strs+1927)
-#define NICE_name      (ntpd_opt_strs+1932)
+#define NICE_DESC      (ntpd_opt_strs+1838)
+#define NICE_NAME      (ntpd_opt_strs+1859)
+#define NICE_name      (ntpd_opt_strs+1864)
 #define NICE_FLAGS     (OPTST_DISABLED)
 
 /*
  *  pidfile option description:
  */
-#define PIDFILE_DESC      (ntpd_opt_strs+1937)
-#define PIDFILE_NAME      (ntpd_opt_strs+1958)
-#define PIDFILE_name      (ntpd_opt_strs+1966)
+#define PIDFILE_DESC      (ntpd_opt_strs+1869)
+#define PIDFILE_NAME      (ntpd_opt_strs+1890)
+#define PIDFILE_name      (ntpd_opt_strs+1898)
 #define PIDFILE_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  priority option description:
  */
-#define PRIORITY_DESC      (ntpd_opt_strs+1974)
-#define PRIORITY_NAME      (ntpd_opt_strs+1991)
-#define PRIORITY_name      (ntpd_opt_strs+2000)
+#define PRIORITY_DESC      (ntpd_opt_strs+1906)
+#define PRIORITY_NAME      (ntpd_opt_strs+1923)
+#define PRIORITY_name      (ntpd_opt_strs+1932)
 #define PRIORITY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
@@ -426,9 +415,9 @@ static int const aNoforkCantList[] = {
  *  quit option description with
  *  "Must also have options" and "Incompatible options":
  */
-#define QUIT_DESC      (ntpd_opt_strs+2009)
-#define QUIT_NAME      (ntpd_opt_strs+2031)
-#define QUIT_name      (ntpd_opt_strs+2036)
+#define QUIT_DESC      (ntpd_opt_strs+1941)
+#define QUIT_NAME      (ntpd_opt_strs+1963)
+#define QUIT_name      (ntpd_opt_strs+1968)
 static int const aQuitCantList[] = {
     INDEX_OPT_SAVECONFIGQUIT,
     INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT };
@@ -437,9 +426,9 @@ static int const aQuitCantList[] = {
 /*
  *  propagationdelay option description:
  */
-#define PROPAGATIONDELAY_DESC      (ntpd_opt_strs+2041)
-#define PROPAGATIONDELAY_NAME      (ntpd_opt_strs+2069)
-#define PROPAGATIONDELAY_name      (ntpd_opt_strs+2086)
+#define PROPAGATIONDELAY_DESC      (ntpd_opt_strs+1973)
+#define PROPAGATIONDELAY_NAME      (ntpd_opt_strs+2001)
+#define PROPAGATIONDELAY_name      (ntpd_opt_strs+2018)
 #define PROPAGATIONDELAY_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -448,9 +437,9 @@ static int const aQuitCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 #ifdef SAVECONFIG
-#define SAVECONFIGQUIT_DESC      (ntpd_opt_strs+2103)
-#define SAVECONFIGQUIT_NAME      (ntpd_opt_strs+2138)
-#define SAVECONFIGQUIT_name      (ntpd_opt_strs+2153)
+#define SAVECONFIGQUIT_DESC      (ntpd_opt_strs+2035)
+#define SAVECONFIGQUIT_NAME      (ntpd_opt_strs+2070)
+#define SAVECONFIGQUIT_name      (ntpd_opt_strs+2085)
 static int const aSaveconfigquitCantList[] = {
     INDEX_OPT_QUIT,
     INDEX_OPT_WAIT_SYNC, NO_EQUIVALENT };
@@ -468,18 +457,18 @@ static int const aSaveconfigquitCantList[] = {
 /*
  *  statsdir option description:
  */
-#define STATSDIR_DESC      (ntpd_opt_strs+2168)
-#define STATSDIR_NAME      (ntpd_opt_strs+2193)
-#define STATSDIR_name      (ntpd_opt_strs+2202)
+#define STATSDIR_DESC      (ntpd_opt_strs+2100)
+#define STATSDIR_NAME      (ntpd_opt_strs+2125)
+#define STATSDIR_name      (ntpd_opt_strs+2134)
 #define STATSDIR_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  trustedkey option description:
  */
-#define TRUSTEDKEY_DESC      (ntpd_opt_strs+2211)
-#define TRUSTEDKEY_NAME      (ntpd_opt_strs+2230)
-#define TRUSTEDKEY_name      (ntpd_opt_strs+2241)
+#define TRUSTEDKEY_DESC      (ntpd_opt_strs+2143)
+#define TRUSTEDKEY_NAME      (ntpd_opt_strs+2162)
+#define TRUSTEDKEY_name      (ntpd_opt_strs+2173)
 #define TRUSTEDKEY_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -487,43 +476,43 @@ static int const aSaveconfigquitCantList[] = {
  *  user option description:
  */
 #ifdef HAVE_DROPROOT
-#define USER_DESC      (ntpd_opt_strs+2252)
-#define USER_NAME      (ntpd_opt_strs+2286)
-#define USER_name      (ntpd_opt_strs+2291)
+#define USER_DESC      (ntpd_opt_strs+2184)
+#define USER_NAME      (ntpd_opt_strs+2218)
+#define USER_name      (ntpd_opt_strs+2223)
 #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+1562)
-#define USER_name      (ntpd_opt_strs+2291)
+#define USER_DESC      (ntpd_opt_strs+1494)
+#define USER_name      (ntpd_opt_strs+2223)
 #endif  /* HAVE_DROPROOT */
 
 /*
  *  updateinterval option description:
  */
-#define UPDATEINTERVAL_DESC      (ntpd_opt_strs+2296)
-#define UPDATEINTERVAL_NAME      (ntpd_opt_strs+2360)
-#define UPDATEINTERVAL_name      (ntpd_opt_strs+2375)
+#define UPDATEINTERVAL_DESC      (ntpd_opt_strs+2228)
+#define UPDATEINTERVAL_NAME      (ntpd_opt_strs+2292)
+#define UPDATEINTERVAL_name      (ntpd_opt_strs+2307)
 #define UPDATEINTERVAL_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
  *  var option description:
  */
-#define VAR_DESC      (ntpd_opt_strs+2390)
-#define VAR_NAME      (ntpd_opt_strs+2420)
-#define VAR_name      (ntpd_opt_strs+2424)
+#define VAR_DESC      (ntpd_opt_strs+2322)
+#define VAR_NAME      (ntpd_opt_strs+2352)
+#define VAR_name      (ntpd_opt_strs+2356)
 #define VAR_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
 /*
  *  dvar option description:
  */
-#define DVAR_DESC      (ntpd_opt_strs+2428)
-#define DVAR_NAME      (ntpd_opt_strs+2462)
-#define DVAR_name      (ntpd_opt_strs+2467)
+#define DVAR_DESC      (ntpd_opt_strs+2360)
+#define DVAR_NAME      (ntpd_opt_strs+2394)
+#define DVAR_name      (ntpd_opt_strs+2399)
 #define DVAR_FLAGS     (OPTST_DISABLED | OPTST_STACKED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -532,9 +521,9 @@ static int const aSaveconfigquitCantList[] = {
  *  "Must also have options" and "Incompatible options":
  */
 #ifdef HAVE_WORKING_FORK
-#define WAIT_SYNC_DESC      (ntpd_opt_strs+2472)
-#define WAIT_SYNC_NAME      (ntpd_opt_strs+2509)
-#define WAIT_SYNC_name      (ntpd_opt_strs+2519)
+#define WAIT_SYNC_DESC      (ntpd_opt_strs+2404)
+#define WAIT_SYNC_NAME      (ntpd_opt_strs+2441)
+#define WAIT_SYNC_name      (ntpd_opt_strs+2451)
 static int const aWait_SyncCantList[] = {
     INDEX_OPT_NOFORK,
     INDEX_OPT_QUIT,
@@ -553,18 +542,18 @@ static int const aWait_SyncCantList[] = {
 /*
  *  slew option description:
  */
-#define SLEW_DESC      (ntpd_opt_strs+2529)
-#define SLEW_NAME      (ntpd_opt_strs+2552)
-#define SLEW_name      (ntpd_opt_strs+2557)
+#define SLEW_DESC      (ntpd_opt_strs+2461)
+#define SLEW_NAME      (ntpd_opt_strs+2484)
+#define SLEW_name      (ntpd_opt_strs+2489)
 #define SLEW_FLAGS     (OPTST_DISABLED)
 
 /*
  *  usepcc option description:
  */
 #ifdef SYS_WINNT
-#define USEPCC_DESC      (ntpd_opt_strs+2562)
-#define USEPCC_NAME      (ntpd_opt_strs+2599)
-#define USEPCC_name      (ntpd_opt_strs+2606)
+#define USEPCC_DESC      (ntpd_opt_strs+2494)
+#define USEPCC_NAME      (ntpd_opt_strs+2531)
+#define USEPCC_name      (ntpd_opt_strs+2538)
 #define USEPCC_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable usepcc */
@@ -578,9 +567,9 @@ static int const aWait_SyncCantList[] = {
  *  pccfreq option description:
  */
 #ifdef SYS_WINNT
-#define PCCFREQ_DESC      (ntpd_opt_strs+2613)
-#define PCCFREQ_NAME      (ntpd_opt_strs+2656)
-#define PCCFREQ_name      (ntpd_opt_strs+2664)
+#define PCCFREQ_DESC      (ntpd_opt_strs+2545)
+#define PCCFREQ_NAME      (ntpd_opt_strs+2588)
+#define PCCFREQ_name      (ntpd_opt_strs+2596)
 #define PCCFREQ_FLAGS     (OPTST_DISABLED \
         | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
@@ -595,9 +584,9 @@ static int const aWait_SyncCantList[] = {
  *  mdns option description:
  */
 #ifdef HAVE_DNSREGISTRATION
-#define MDNS_DESC      (ntpd_opt_strs+2672)
-#define MDNS_NAME      (ntpd_opt_strs+2707)
-#define MDNS_name      (ntpd_opt_strs+2712)
+#define MDNS_DESC      (ntpd_opt_strs+2604)
+#define MDNS_NAME      (ntpd_opt_strs+2639)
+#define MDNS_name      (ntpd_opt_strs+2644)
 #define MDNS_FLAGS     (OPTST_DISABLED)
 
 #else   /* disable mdns */
@@ -610,11 +599,11 @@ static int const aWait_SyncCantList[] = {
 /*
  *  Help/More_Help/Version option descriptions:
  */
-#define HELP_DESC       (ntpd_opt_strs+2717)
-#define HELP_name       (ntpd_opt_strs+2761)
+#define HELP_DESC       (ntpd_opt_strs+2649)
+#define HELP_name       (ntpd_opt_strs+2693)
 #ifdef HAVE_WORKING_FORK
-#define MORE_HELP_DESC  (ntpd_opt_strs+2766)
-#define MORE_HELP_name  (ntpd_opt_strs+2811)
+#define MORE_HELP_DESC  (ntpd_opt_strs+2698)
+#define MORE_HELP_name  (ntpd_opt_strs+2743)
 #define MORE_HELP_FLAGS (OPTST_IMM | OPTST_NO_INIT)
 #else
 #define MORE_HELP_DESC  NULL
@@ -627,16 +616,11 @@ 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+2821)
-#define VER_name        (ntpd_opt_strs+2857)
+#define VER_DESC        (ntpd_opt_strs+2753)
+#define VER_name        (ntpd_opt_strs+2789)
 /*
  *  Declare option callback procedures
  */
-#ifdef DEBUG
-  static tOptProc doOptSet_Debug_Level;
-#else /* not DEBUG */
-# define doOptSet_Debug_Level NULL
-#endif /* def/not DEBUG */
 #if defined(TEST_NTPD_OPTS)
 /*
  *  Under test, omit argument processing, or call optionStackArg,
@@ -648,7 +632,7 @@ static tOptProc
 /*
  *  #define map the "normal" callout procs to the test ones...
  */
-#define SET_DEBUG_LEVEL_OPT_PROC optionStackArg
+#define DEBUG_LEVEL_OPT_PROC optionStackArg
 
 
 #else /* NOT defined TEST_NTPD_OPTS */
@@ -661,12 +645,12 @@ extern tOptProc
     optionStackArg,        optionTimeDate,        optionTimeVal,
     optionUnstackArg,      optionVendorOption,    optionVersionStderr;
 static tOptProc
-    doUsageOpt;
+    doOptDebug_Level, doUsageOpt;
 
 /*
  *  #define map the "normal" callout procs
  */
-#define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level
+#define DEBUG_LEVEL_OPT_PROC doOptDebug_Level
 
 #endif /* defined(TEST_NTPD_OPTS) */
 #define VER_PROC        ntpOptionPrintVersion
@@ -758,7 +742,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* last opt argumnt */ { NULL }, /* --debug-level */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
+     /* option proc      */ DEBUG_LEVEL_OPT_PROC,
      /* desc, NAME, name */ DEBUG_LEVEL_DESC, DEBUG_LEVEL_NAME, DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
@@ -770,7 +754,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* last opt argumnt */ { NULL }, /* --set-debug-level */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ SET_DEBUG_LEVEL_OPT_PROC,
+     /* option proc      */ optionNumericVal,
      /* desc, NAME, name */ SET_DEBUG_LEVEL_DESC, SET_DEBUG_LEVEL_NAME, SET_DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
@@ -1130,14 +1114,14 @@ static tOptDesc optDesc[OPTION_CT] = {
  *
  *  Define the ntpd Option Environment
  */
-#define zPROGNAME       (ntpd_opt_strs+2865)
-#define zUsageTitle     (ntpd_opt_strs+2870)
+#define zPROGNAME       (ntpd_opt_strs+2797)
+#define zUsageTitle     (ntpd_opt_strs+2802)
 #define zRcName         NULL
 #define apzHomeList     NULL
-#define zBugsAddr       (ntpd_opt_strs+3003)
-#define zExplain        (ntpd_opt_strs+3037)
+#define zBugsAddr       (ntpd_opt_strs+2935)
+#define zExplain        (ntpd_opt_strs+2969)
 #define zDetail         (NULL)
-#define zFullVersion    (ntpd_opt_strs+3040)
+#define zFullVersion    (ntpd_opt_strs+2972)
 /* extracted from optcode.tlib near line 350 */
 
 #if defined(ENABLE_NLS)
@@ -1178,20 +1162,19 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
- * Code to handle the set-debug-level option, when DEBUG is #define-d.
+ * Code to handle the debug-level option.
  *
  * @param pOptions the ntpd options data structure
  * @param pOptDesc the option descriptor for this option.
  */
-#ifdef DEBUG
 static void
-doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
+doOptDebug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    /* extracted from ntpdbase-opts.def, line 100 */
-DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
+    /* extracted from debug-opt.def, line 15 */
+OPT_VALUE_SET_DEBUG_LEVEL++;
+    (void)pOptDesc;
     (void)pOptions;
 }
-#endif /* defined DEBUG */
 #endif /* defined(TEST_NTPD_OPTS) */
 /* extracted from optmain.tlib near line 48 */
 
diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index 2f7fee11b..7c2ba9e91 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  October  9, 2012 at 11:38:02 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:26:53 AM by AutoGen 5.16.2
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  *
@@ -104,8 +104,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    37
-#define NTPD_VERSION       "4.2.7p310"
-#define NTPD_FULL_VERSION  "ntpd 4.2.7p310"
+#define NTPD_VERSION       "4.2.7p311"
+#define NTPD_FULL_VERSION  "ntpd 4.2.7p311"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -326,6 +326,8 @@ typedef enum {
 #define VALUE_OPT_CONFIGFILE     'c'
 #define VALUE_OPT_DEBUG_LEVEL    'd'
 #define VALUE_OPT_SET_DEBUG_LEVEL 'D'
+
+#define OPT_VALUE_SET_DEBUG_LEVEL (DESC(SET_DEBUG_LEVEL).optArg.argInt)
 #define VALUE_OPT_DRIFTFILE      'f'
 #define VALUE_OPT_PANICGATE      'g'
 #define VALUE_OPT_JAILDIR        'i'
diff --git a/ntpd/ntpd.1ntpdman b/ntpd/ntpd.1ntpdman
index 9dd82bf9a..a450187da 100644
--- a/ntpd/ntpd.1ntpdman
+++ b/ntpd/ntpd.1ntpdman
@@ -1,8 +1,8 @@
-.TH ntpd 1ntpdman "09 Oct 2012" "4.2.7p310" "User Commands"
+.TH ntpd 1ntpdman "10 Oct 2012" "4.2.7p311" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:09 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:12 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -62,17 +62,15 @@ The name and path of the configuration file,
 by default.
 .TP
 .BR \-d ", " -\-debug\-level
-Increase output debug message level.
+Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-Increase the debugging message output level.
 .TP
-.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
-Set the output debug message level.
+.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
+Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
 .TP
 .BR \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP
 frequency drift file name.
diff --git a/ntpd/ntpd.1ntpdmdoc b/ntpd/ntpd.1ntpdmdoc
index d3f876170..941debf48 100644
--- a/ntpd/ntpd.1ntpdmdoc
+++ b/ntpd/ntpd.1ntpdmdoc
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTPD 1ntpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:21 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:24 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -61,16 +61,16 @@ The name and path of the configuration file,
 /etc/ntp.conf
 by default.
 .It  \-d ", " -\-debug\-level
-Increase output debug message level.
+Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-Increase the debugging message output level.
-.It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
-Set the output debug message level.
+.sp
+.It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
+Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
+.sp
 .sp
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
 .It  \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP
 frequency drift file name.
 .sp
diff --git a/ntpd/ntpd.man.in b/ntpd/ntpd.man.in
index cacfd2fa5..f42f4f196 100644
--- a/ntpd/ntpd.man.in
+++ b/ntpd/ntpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpd @NTPD_MS@ "09 Oct 2012" "4.2.7p310" "User Commands"
+.TH ntpd @NTPD_MS@ "10 Oct 2012" "4.2.7p311" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:09 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:12 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -62,17 +62,15 @@ The name and path of the configuration file,
 by default.
 .TP
 .BR \-d ", " -\-debug\-level
-Increase output debug message level.
+Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-Increase the debugging message output level.
 .TP
-.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
-Set the output debug message level.
+.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
+Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
 .TP
 .BR \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP
 frequency drift file name.
diff --git a/ntpd/ntpd.mdoc.in b/ntpd/ntpd.mdoc.in
index 5b64644e9..ab9182c94 100644
--- a/ntpd/ntpd.mdoc.in
+++ b/ntpd/ntpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTPD @NTPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:21 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:24 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -61,16 +61,16 @@ The name and path of the configuration file,
 /etc/ntp.conf
 by default.
 .It  \-d ", " -\-debug\-level
-Increase output debug message level.
+Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
-Increase the debugging message output level.
-.It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
-Set the output debug message level.
+.sp
+.It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
+Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
+.sp
 .sp
-Set the output debugging level.  Can be supplied multiple times,
-but each overrides the previous value(s).
 .It  \-f " \fIstring\fP, " \-\-driftfile "=" \fIstring\fP
 frequency drift file name.
 .sp
diff --git a/ntpdc/invoke-ntpdc.texi b/ntpdc/invoke-ntpdc.texi
index 0ad6f9156..fbd148709 100644
--- a/ntpdc/invoke-ntpdc.texi
+++ b/ntpdc/invoke-ntpdc.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpdc.texi)
 # 
-# It has been AutoGen-ed  October  9, 2012 at 11:39:40 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  October 10, 2012 at 06:28:47 AM by AutoGen 5.16.2
 # From the definitions    ntpdc-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -69,7 +69,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p310
+ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p311
 USAGE:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -82,7 +82,7 @@ USAGE:  ntpdc [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
                                 - may appear multiple times
    -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the debug verbosity level
+   -D Num set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -i no  interactive    Force ntpq to operate in interactive mode
                                 - prohibits these options:
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index 6a3ff72ea..d9173b35e 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  October  9, 2012 at 11:39:31 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:28:34 AM by AutoGen 5.16.2
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  ntpdc option static const strings
  */
 static char const ntpdc_opt_strs[1862] =
-/*     0 */ "ntpdc 4.2.7p310\n"
+/*     0 */ "ntpdc 4.2.7p311\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"
@@ -130,14 +130,14 @@ static char const ntpdc_opt_strs[1862] =
 /*  1640 */ "no-load-opts\0"
 /*  1653 */ "no\0"
 /*  1656 */ "NTPDC\0"
-/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p310\n"
+/*  1662 */ "ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p311\n"
             "USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0"
 /*  1794 */ "$HOME\0"
 /*  1800 */ ".\0"
 /*  1802 */ ".ntprc\0"
 /*  1809 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1843 */ "\n\n\0"
-/*  1846 */ "ntpdc 4.2.7p310";
+/*  1846 */ "ntpdc 4.2.7p311";
 
 /*
  *  ipv4 option description with
@@ -185,7 +185,7 @@ static int const aIpv6CantList[] = {
 #define SET_DEBUG_LEVEL_NAME      (ntpdc_opt_strs+1161)
 #define SET_DEBUG_LEVEL_name      (ntpdc_opt_strs+1177)
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
  *  interactive option description with
@@ -285,7 +285,7 @@ static tOptProc
 /*
  *  #define map the "normal" callout procs to the test ones...
  */
-#define SET_DEBUG_LEVEL_OPT_PROC optionStackArg
+#define DEBUG_LEVEL_OPT_PROC optionStackArg
 
 
 #else /* NOT defined TEST_NTPDC_OPTS */
@@ -298,12 +298,12 @@ extern tOptProc
     optionStackArg,        optionTimeDate,        optionTimeVal,
     optionUnstackArg,      optionVendorOption,    optionVersionStderr;
 static tOptProc
-    doOptSet_Debug_Level, doUsageOpt;
+    doOptDebug_Level, doUsageOpt;
 
 /*
  *  #define map the "normal" callout procs
  */
-#define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level
+#define DEBUG_LEVEL_OPT_PROC doOptDebug_Level
 
 #endif /* defined(TEST_NTPDC_OPTS) */
 #define VER_PROC        ntpOptionPrintVersion
@@ -359,7 +359,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* last opt argumnt */ { NULL }, /* --debug-level */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
+     /* option proc      */ DEBUG_LEVEL_OPT_PROC,
      /* desc, NAME, name */ DEBUG_LEVEL_DESC, DEBUG_LEVEL_NAME, DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
@@ -371,7 +371,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* last opt argumnt */ { NULL }, /* --set-debug-level */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ SET_DEBUG_LEVEL_OPT_PROC,
+     /* option proc      */ optionNumericVal,
      /* desc, NAME, name */ SET_DEBUG_LEVEL_DESC, SET_DEBUG_LEVEL_NAME, SET_DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
@@ -556,16 +556,17 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
- * Code to handle the set-debug-level option.
+ * Code to handle the debug-level option.
  *
  * @param pOptions the ntpdc options data structure
  * @param pOptDesc the option descriptor for this option.
  */
 static void
-doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
+doOptDebug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    /* extracted from debug-opt.def, line 26 */
-DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
+    /* extracted from debug-opt.def, line 15 */
+OPT_VALUE_SET_DEBUG_LEVEL++;
+    (void)pOptDesc;
     (void)pOptions;
 }
 #endif /* defined(TEST_NTPDC_OPTS) */
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index f1020a924..895a5422a 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  October  9, 2012 at 11:39:30 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:28:34 AM by AutoGen 5.16.2
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  *
@@ -82,8 +82,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.7p310"
-#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p310"
+#define NTPDC_VERSION       "4.2.7p311"
+#define NTPDC_FULL_VERSION  "ntpdc 4.2.7p311"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -182,6 +182,8 @@ typedef enum {
 #define VALUE_OPT_COMMAND        'c'
 #define VALUE_OPT_DEBUG_LEVEL    'd'
 #define VALUE_OPT_SET_DEBUG_LEVEL 'D'
+
+#define OPT_VALUE_SET_DEBUG_LEVEL (DESC(SET_DEBUG_LEVEL).optArg.argInt)
 #define VALUE_OPT_INTERACTIVE    'i'
 #define VALUE_OPT_LISTPEERS      'l'
 #define VALUE_OPT_NUMERIC        'n'
diff --git a/ntpdc/ntpdc.1ntpdcman b/ntpdc/ntpdc.1ntpdcman
index 79da647ac..bc64511a2 100644
--- a/ntpdc/ntpdc.1ntpdcman
+++ b/ntpdc/ntpdc.1ntpdcman
@@ -1,8 +1,8 @@
-.TH ntpdc 1ntpdcman "09 Oct 2012" "4.2.7p310" "User Commands"
+.TH ntpdc 1ntpdcman "10 Oct 2012" "4.2.7p311" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:36 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:43 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -45,9 +45,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .TP
 .BR \-i ", " -\-interactive
diff --git a/ntpdc/ntpdc.1ntpdcmdoc b/ntpdc/ntpdc.1ntpdcmdoc
index 1cdb0d07f..748cc0562 100644
--- a/ntpdc/ntpdc.1ntpdcmdoc
+++ b/ntpdc/ntpdc.1ntpdcmdoc
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTPDC 1ntpdcmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:42 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:49 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -46,9 +46,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .sp
-.It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .sp
 .It  \-i ", " -\-interactive
diff --git a/ntpdc/ntpdc.html b/ntpdc/ntpdc.html
index c4fbddf89..ebaefe859 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.
 
-  <p>This document applies to version 4.2.7p310 of <code>ntpdc</code>.
+  <p>This document applies to version 4.2.7p311 of <code>ntpdc</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -145,7 +145,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p310
+<pre class="example">ntpdc - vendor-specific NTPD control program - Ver. 4.2.7p311
 USAGE:  ntpdc [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -158,7 +158,7 @@ USAGE:  ntpdc [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]
                                 - may appear multiple times
    -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the debug verbosity level
+   -D Num set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -i no  interactive    Force ntpq to operate in interactive mode
                                 - prohibits these options:
diff --git a/ntpdc/ntpdc.man.in b/ntpdc/ntpdc.man.in
index 9789348db..73c4803ef 100644
--- a/ntpdc/ntpdc.man.in
+++ b/ntpdc/ntpdc.man.in
@@ -1,8 +1,8 @@
-.TH ntpdc @NTPDC_MS@ "09 Oct 2012" "4.2.7p310" "User Commands"
+.TH ntpdc @NTPDC_MS@ "10 Oct 2012" "4.2.7p311" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:36 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:43 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -45,9 +45,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .TP
 .BR \-i ", " -\-interactive
diff --git a/ntpdc/ntpdc.mdoc.in b/ntpdc/ntpdc.mdoc.in
index ba2fea79f..c21d2676a 100644
--- a/ntpdc/ntpdc.mdoc.in
+++ b/ntpdc/ntpdc.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTPDC @NTPDC_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpdc-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:42 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:28:49 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -46,9 +46,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .sp
-.It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .sp
 .It  \-i ", " -\-interactive
diff --git a/ntpq/invoke-ntpq.texi b/ntpq/invoke-ntpq.texi
index eaa1122c0..cbee61e15 100644
--- a/ntpq/invoke-ntpq.texi
+++ b/ntpq/invoke-ntpq.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpq.texi)
 # 
-# It has been AutoGen-ed  October  9, 2012 at 11:39:55 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  October 10, 2012 at 06:29:18 AM by AutoGen 5.16.2
 # From the definitions    ntpq-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -328,7 +328,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpq - standard NTP query program - Ver. 4.2.7p310
+ntpq - standard NTP query program - Ver. 4.2.7p311
 USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
   Flg Arg Option-Name    Description
    -4 no  ipv4           Force IPv4 DNS name resolution
@@ -341,7 +341,7 @@ USAGE:  ntpq [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... [ host ...]
                                 - may appear multiple times
    -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the debug verbosity level
+   -D Num set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -p no  peers          Print a list of the peers
                                 - prohibits these options:
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index b0c808367..8707769f4 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  October  9, 2012 at 11:39:45 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:28:52 AM by AutoGen 5.16.2
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -72,7 +72,7 @@ extern FILE * option_usage_fp;
  *  ntpq option static const strings
  */
 static char const ntpq_opt_strs[1833] =
-/*     0 */ "ntpq 4.2.7p310\n"
+/*     0 */ "ntpq 4.2.7p311\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"
@@ -128,13 +128,13 @@ static char const ntpq_opt_strs[1833] =
 /*  1627 */ "no-load-opts\0"
 /*  1640 */ "no\0"
 /*  1643 */ "NTPQ\0"
-/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p310\n"
+/*  1648 */ "ntpq - standard NTP query program - Ver. 4.2.7p311\n"
             "USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n\0"
 /*  1769 */ "$HOME\0"
 /*  1775 */ ".\0"
 /*  1777 */ ".ntprc\0"
 /*  1784 */ "http://bugs.ntp.org, bugs@ntp.org\0"
-/*  1818 */ "ntpq 4.2.7p310";
+/*  1818 */ "ntpq 4.2.7p311";
 
 /*
  *  ipv4 option description with
@@ -182,7 +182,7 @@ static int const aIpv6CantList[] = {
 #define SET_DEBUG_LEVEL_NAME      (ntpq_opt_strs+1160)
 #define SET_DEBUG_LEVEL_name      (ntpq_opt_strs+1176)
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
  *  peers option description with
@@ -269,7 +269,7 @@ static tOptProc
  *  #define map the "normal" callout procs to the test ones...
  */
 #define COMMAND_OPT_PROC optionStackArg
-#define SET_DEBUG_LEVEL_OPT_PROC optionStackArg
+#define DEBUG_LEVEL_OPT_PROC optionStackArg
 #define PEERS_OPT_PROC optionStackArg
 
 
@@ -284,13 +284,13 @@ extern tOptProc
     optionTimeVal,           optionUnstackArg,        optionVendorOption,
     optionVersionStderr;
 static tOptProc
-    doOptSet_Debug_Level, doUsageOpt;
+    doOptDebug_Level, doUsageOpt;
 
 /*
  *  #define map the "normal" callout procs
  */
 #define COMMAND_OPT_PROC ntpq_custom_opt_handler
-#define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level
+#define DEBUG_LEVEL_OPT_PROC doOptDebug_Level
 #define PEERS_OPT_PROC ntpq_custom_opt_handler
 
 #endif /* defined(TEST_NTPQ_OPTS) */
@@ -347,7 +347,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* last opt argumnt */ { NULL }, /* --debug-level */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
+     /* option proc      */ DEBUG_LEVEL_OPT_PROC,
      /* desc, NAME, name */ DEBUG_LEVEL_DESC, DEBUG_LEVEL_NAME, DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
@@ -359,7 +359,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* last opt argumnt */ { NULL }, /* --set-debug-level */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ SET_DEBUG_LEVEL_OPT_PROC,
+     /* option proc      */ optionNumericVal,
      /* desc, NAME, name */ SET_DEBUG_LEVEL_DESC, SET_DEBUG_LEVEL_NAME, SET_DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
@@ -532,16 +532,17 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
- * Code to handle the set-debug-level option.
+ * Code to handle the debug-level option.
  *
  * @param pOptions the ntpq options data structure
  * @param pOptDesc the option descriptor for this option.
  */
 static void
-doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
+doOptDebug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    /* extracted from debug-opt.def, line 26 */
-DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
+    /* extracted from debug-opt.def, line 15 */
+OPT_VALUE_SET_DEBUG_LEVEL++;
+    (void)pOptDesc;
     (void)pOptions;
 }
 #endif /* defined(TEST_NTPQ_OPTS) */
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index 56509bccb..5e0e7c8f8 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  October  9, 2012 at 11:39:45 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:28:51 AM by AutoGen 5.16.2
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  *
@@ -81,8 +81,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    14
-#define NTPQ_VERSION       "4.2.7p310"
-#define NTPQ_FULL_VERSION  "ntpq 4.2.7p310"
+#define NTPQ_VERSION       "4.2.7p311"
+#define NTPQ_FULL_VERSION  "ntpq 4.2.7p311"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -176,6 +176,8 @@ typedef enum {
 #define VALUE_OPT_COMMAND        'c'
 #define VALUE_OPT_DEBUG_LEVEL    'd'
 #define VALUE_OPT_SET_DEBUG_LEVEL 'D'
+
+#define OPT_VALUE_SET_DEBUG_LEVEL (DESC(SET_DEBUG_LEVEL).optArg.argInt)
 #define VALUE_OPT_PEERS          'p'
 #define VALUE_OPT_INTERACTIVE    'i'
 #define VALUE_OPT_NUMERIC        'n'
diff --git a/ntpq/ntpq.1ntpqman b/ntpq/ntpq.1ntpqman
index 8df01182c..b16425678 100644
--- a/ntpq/ntpq.1ntpqman
+++ b/ntpq/ntpq.1ntpqman
@@ -1,8 +1,8 @@
-.TH ntpq 1ntpqman "09 Oct 2012" "4.2.7p310" "User Commands"
+.TH ntpq 1ntpqman "10 Oct 2012" "4.2.7p311" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:52 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:14 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -44,9 +44,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .TP
 .BR \-p ", " -\-peers
diff --git a/ntpq/ntpq.1ntpqmdoc b/ntpq/ntpq.1ntpqmdoc
index 7d859df8f..c4cfd00bc 100644
--- a/ntpq/ntpq.1ntpqmdoc
+++ b/ntpq/ntpq.1ntpqmdoc
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTPQ 1ntpqmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:57 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:20 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -46,9 +46,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .sp
-.It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .sp
 .It  \-p ", " -\-peers
diff --git a/ntpq/ntpq.man.in b/ntpq/ntpq.man.in
index f6c75292d..c882d2915 100644
--- a/ntpq/ntpq.man.in
+++ b/ntpq/ntpq.man.in
@@ -1,8 +1,8 @@
-.TH ntpq @NTPQ_MS@ "09 Oct 2012" "4.2.7p310" "User Commands"
+.TH ntpq @NTPQ_MS@ "10 Oct 2012" "4.2.7p311" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:52 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:14 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -44,9 +44,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .TP
 .BR \-p ", " -\-peers
diff --git a/ntpq/ntpq.mdoc.in b/ntpq/ntpq.mdoc.in
index 310030b0a..ec01816db 100644
--- a/ntpq/ntpq.mdoc.in
+++ b/ntpq/ntpq.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTPQ @NTPQ_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpq-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:39:57 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:20 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -46,9 +46,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .sp
-.It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .sp
 .It  \-p ", " -\-peers
diff --git a/ntpsnmpd/invoke-ntpsnmpd.texi b/ntpsnmpd/invoke-ntpsnmpd.texi
index 15e37dfeb..e11017503 100644
--- a/ntpsnmpd/invoke-ntpsnmpd.texi
+++ b/ntpsnmpd/invoke-ntpsnmpd.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntpsnmpd.texi)
 # 
-# It has been AutoGen-ed  October  9, 2012 at 11:40:11 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  October 10, 2012 at 06:29:33 AM by AutoGen 5.16.2
 # From the definitions    ntpsnmpd-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -42,7 +42,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p310
+ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p311
 USAGE:  ntpsnmpd [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -n no  nofork         Do not fork
diff --git a/ntpsnmpd/ntpsnmpd-opts.c b/ntpsnmpd/ntpsnmpd-opts.c
index 4d8947f24..86226d5ca 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  October  9, 2012 at 11:40:00 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:29:22 AM by AutoGen 5.16.2
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -64,7 +64,7 @@ extern FILE * option_usage_fp;
  *  ntpsnmpd option static const strings
  */
 static char const ntpsnmpd_opt_strs[1561] =
-/*     0 */ "ntpsnmpd 4.2.7p310\n"
+/*     0 */ "ntpsnmpd 4.2.7p311\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"
@@ -103,14 +103,14 @@ static char const ntpsnmpd_opt_strs[1561] =
 /*  1360 */ "no-load-opts\0"
 /*  1373 */ "no\0"
 /*  1376 */ "NTPSNMPD\0"
-/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p310\n"
+/*  1385 */ "ntpsnmpd - NTP SNMP MIB agent - Ver. 4.2.7p311\n"
             "USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
 /*  1490 */ "$HOME\0"
 /*  1496 */ ".\0"
 /*  1498 */ ".ntprc\0"
 /*  1505 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  1539 */ "\n\n\0"
-/*  1542 */ "ntpsnmpd 4.2.7p310";
+/*  1542 */ "ntpsnmpd 4.2.7p311";
 
 /*
  *  nofork option description:
diff --git a/ntpsnmpd/ntpsnmpd-opts.h b/ntpsnmpd/ntpsnmpd-opts.h
index ac2634c5d..35edcd85f 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  October  9, 2012 at 11:40:00 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:29:22 AM by AutoGen 5.16.2
  *  From the definitions    ntpsnmpd-opts.def
  *  and the template file   options
  *
@@ -75,8 +75,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    8
-#define NTPSNMPD_VERSION       "4.2.7p310"
-#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p310"
+#define NTPSNMPD_VERSION       "4.2.7p311"
+#define NTPSNMPD_FULL_VERSION  "ntpsnmpd 4.2.7p311"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
index cf8985478..f62e60c7a 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdman
@@ -1,8 +1,8 @@
-.TH ntpsnmpd 1ntpsnmpdman "09 Oct 2012" "4.2.7p310" "User Commands"
+.TH ntpsnmpd 1ntpsnmpdman "10 Oct 2012" "4.2.7p311" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:40:08 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:29 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
index 5f7080771..4d8e8c457 100644
--- a/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
+++ b/ntpsnmpd/ntpsnmpd.1ntpsnmpdmdoc
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTPSNMPD 1ntpsnmpdmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:40:13 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:35 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/ntpsnmpd/ntpsnmpd.man.in b/ntpsnmpd/ntpsnmpd.man.in
index b143d3beb..89d04ba98 100644
--- a/ntpsnmpd/ntpsnmpd.man.in
+++ b/ntpsnmpd/ntpsnmpd.man.in
@@ -1,8 +1,8 @@
-.TH ntpsnmpd @NTPSNMPD_MS@ "09 Oct 2012" "4.2.7p310" "User Commands"
+.TH ntpsnmpd @NTPSNMPD_MS@ "10 Oct 2012" "4.2.7p311" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:40:08 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:29 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/ntpsnmpd/ntpsnmpd.mdoc.in b/ntpsnmpd/ntpsnmpd.mdoc.in
index a527473be..e68c4a9b0 100644
--- a/ntpsnmpd/ntpsnmpd.mdoc.in
+++ b/ntpsnmpd/ntpsnmpd.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt NTPSNMPD @NTPSNMPD_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (ntpsnmpd-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:40:13 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:35 AM by AutoGen 5.16.2
 .\"  From the definitions    ntpsnmpd-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/packageinfo.sh b/packageinfo.sh
index 9f2e3f493..f84ce9a35 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=310
+point=311
 
 ### betapoint is normally modified by script.
 # ntp-stable Beta number (betapoint)
diff --git a/scripts/invoke-ntp-wait.texi b/scripts/invoke-ntp-wait.texi
index ea405ae4b..a2b699b91 100644
--- a/scripts/invoke-ntp-wait.texi
+++ b/scripts/invoke-ntp-wait.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-wait.texi)
 # 
-# It has been AutoGen-ed  October  9, 2012 at 11:36:34 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  October 10, 2012 at 06:25:52 AM by AutoGen 5.16.2
 # From the definitions    ntp-wait-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
diff --git a/scripts/ntp-wait.1ntp-waitman b/scripts/ntp-wait.1ntp-waitman
index 744035af3..2b793ea3b 100644
--- a/scripts/ntp-wait.1ntp-waitman
+++ b/scripts/ntp-wait.1ntp-waitman
@@ -1,8 +1,8 @@
-.TH ntp-wait 1ntp-waitman "09 Oct 2012" "ntp (4.2.7p310)" "User Commands"
+.TH ntp-wait 1ntp-waitman "10 Oct 2012" "ntp (4.2.7p311)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:36:30 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:25:49 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.1ntp-waitmdoc b/scripts/ntp-wait.1ntp-waitmdoc
index 3b629b20a..205e64b8b 100644
--- a/scripts/ntp-wait.1ntp-waitmdoc
+++ b/scripts/ntp-wait.1ntp-waitmdoc
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 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  October  9, 2012 at 11:36:36 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:25:54 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/scripts/ntp-wait.html b/scripts/ntp-wait.html
index 31977025f..8c3a3d39b 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.
 
-  <p>This document applies to version 4.2.7p310 of <code>ntp-wait</code>.
+  <p>This document applies to version 4.2.7p311 of <code>ntp-wait</code>.
 
   <p>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 48fecc303..2522b93d4 100644
--- a/scripts/ntp-wait.man.in
+++ b/scripts/ntp-wait.man.in
@@ -1,8 +1,8 @@
-.TH ntp-wait @NTP_WAIT_MS@ "09 Oct 2012" "ntp (4.2.7p310)" "User Commands"
+.TH ntp-wait @NTP_WAIT_MS@ "10 Oct 2012" "ntp (4.2.7p311)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-wait-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:36:30 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:25:49 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
diff --git a/scripts/ntp-wait.mdoc.in b/scripts/ntp-wait.mdoc.in
index 7aae78cff..08ae5c9ee 100644
--- a/scripts/ntp-wait.mdoc.in
+++ b/scripts/ntp-wait.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 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  October  9, 2012 at 11:36:36 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:25:54 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-wait-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
diff --git a/sntp/invoke-sntp.texi b/sntp/invoke-sntp.texi
index 7614e63eb..5a7f01be7 100644
--- a/sntp/invoke-sntp.texi
+++ b/sntp/invoke-sntp.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-sntp.texi)
 # 
-# It has been AutoGen-ed  October  9, 2012 at 11:41:05 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  October 10, 2012 at 06:30:26 AM by AutoGen 5.16.2
 # From the definitions    sntp-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -125,7 +125,7 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p310
+sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p311
 USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -142,7 +142,7 @@ USAGE:  sntp [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]... \
                                 - may appear multiple times
    -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the debug verbosity level
+   -D Num set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -g Num gap            The gap (in milliseconds) between time requests
    -K Fil kod            KoD history filename
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index edca857e2..299ca5776 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  October  9, 2012 at 11:33:26 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:23:13 AM by AutoGen 5.16.2
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -73,7 +73,7 @@ extern FILE * option_usage_fp;
  *  sntp option static const strings
  */
 static char const sntp_opt_strs[2491] =
-/*     0 */ "sntp 4.2.7p310\n"
+/*     0 */ "sntp 4.2.7p311\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"
@@ -157,7 +157,7 @@ static char const sntp_opt_strs[2491] =
 /*  2235 */ "LOAD_OPTS\0"
 /*  2245 */ "no-load-opts\0"
 /*  2258 */ "SNTP\0"
-/*  2263 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p310\n"
+/*  2263 */ "sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p311\n"
             "USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... \\\n"
             "\t\t[ hostname-or-IP ...]\n\0"
 /*  2424 */ "$HOME\0"
@@ -165,7 +165,7 @@ static char const sntp_opt_strs[2491] =
 /*  2432 */ ".ntprc\0"
 /*  2439 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2473 */ "\n\n\0"
-/*  2476 */ "sntp 4.2.7p310";
+/*  2476 */ "sntp 4.2.7p311";
 
 /*
  *  ipv4 option description with
@@ -231,7 +231,7 @@ static int const aIpv6CantList[] = {
 #define SET_DEBUG_LEVEL_NAME      (sntp_opt_strs+1349)
 #define SET_DEBUG_LEVEL_name      (sntp_opt_strs+1365)
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
  *  gap option description:
@@ -378,7 +378,7 @@ static tOptProc
 /*
  *  #define map the "normal" callout procs to the test ones...
  */
-#define SET_DEBUG_LEVEL_OPT_PROC optionStackArg
+#define DEBUG_LEVEL_OPT_PROC optionStackArg
 
 
 #else /* NOT defined TEST_SNTP_OPTS */
@@ -391,14 +391,13 @@ extern tOptProc
     optionStackArg,        optionTimeDate,        optionTimeVal,
     optionUnstackArg,      optionVendorOption,    optionVersionStderr;
 static tOptProc
-    doOptKeyfile,         doOptKod,             doOptLogfile,
-    doOptNtpversion,      doOptSet_Debug_Level, doOptSteplimit,
-    doUsageOpt;
+    doOptDebug_Level, doOptKeyfile,     doOptKod,         doOptLogfile,
+    doOptNtpversion,  doOptSteplimit,   doUsageOpt;
 
 /*
  *  #define map the "normal" callout procs
  */
-#define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level
+#define DEBUG_LEVEL_OPT_PROC doOptDebug_Level
 
 #endif /* defined(TEST_SNTP_OPTS) */
 #define VER_PROC        ntpOptionPrintVersion
@@ -478,7 +477,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* last opt argumnt */ { NULL }, /* --debug-level */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
+     /* option proc      */ DEBUG_LEVEL_OPT_PROC,
      /* desc, NAME, name */ DEBUG_LEVEL_DESC, DEBUG_LEVEL_NAME, DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
@@ -490,7 +489,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* last opt argumnt */ { NULL }, /* --set-debug-level */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ SET_DEBUG_LEVEL_OPT_PROC,
+     /* option proc      */ optionNumericVal,
      /* desc, NAME, name */ SET_DEBUG_LEVEL_DESC, SET_DEBUG_LEVEL_NAME, SET_DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
@@ -747,16 +746,17 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
- * Code to handle the set-debug-level option.
+ * Code to handle the debug-level option.
  *
  * @param pOptions the sntp options data structure
  * @param pOptDesc the option descriptor for this option.
  */
 static void
-doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
+doOptDebug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    /* extracted from debug-opt.def, line 26 */
-DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
+    /* extracted from debug-opt.def, line 15 */
+OPT_VALUE_SET_DEBUG_LEVEL++;
+    (void)pOptDesc;
     (void)pOptions;
 }
 #endif /* defined(TEST_SNTP_OPTS) */
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index f1062acfa..bade3ff83 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  October  9, 2012 at 11:33:25 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:23:12 AM by AutoGen 5.16.2
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  *
@@ -90,8 +90,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    23
-#define SNTP_VERSION       "4.2.7p310"
-#define SNTP_FULL_VERSION  "sntp 4.2.7p310"
+#define SNTP_VERSION       "4.2.7p311"
+#define SNTP_FULL_VERSION  "sntp 4.2.7p311"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -234,6 +234,8 @@ typedef enum {
 #define VALUE_OPT_CONCURRENT     'c'
 #define VALUE_OPT_DEBUG_LEVEL    'd'
 #define VALUE_OPT_SET_DEBUG_LEVEL 'D'
+
+#define OPT_VALUE_SET_DEBUG_LEVEL (DESC(SET_DEBUG_LEVEL).optArg.argInt)
 #define VALUE_OPT_GAP            'g'
 
 #define OPT_VALUE_GAP            (DESC(GAP).optArg.argInt)
diff --git a/sntp/sntp.1sntpman b/sntp/sntp.1sntpman
index 653e271f2..5ae3b6097 100644
--- a/sntp/sntp.1sntpman
+++ b/sntp/sntp.1sntpman
@@ -1,8 +1,8 @@
-.TH sntp 1sntpman "09 Oct 2012" "4.2.7p310" "User Commands"
+.TH sntp 1sntpman "10 Oct 2012" "4.2.7p311" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:41:01 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:30:21 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -67,9 +67,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .TP
 .BR \-g " \fImilliseconds\fP, " \-\-gap "=" \fImilliseconds\fP
diff --git a/sntp/sntp.1sntpmdoc b/sntp/sntp.1sntpmdoc
index 060c91c6a..1fd015509 100644
--- a/sntp/sntp.1sntpmdoc
+++ b/sntp/sntp.1sntpmdoc
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt SNTP 1sntpmdoc User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:41:07 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:30:28 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -67,9 +67,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .sp
-.It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .sp
 .It  \-g " \fImilliseconds\fP, " \-\-gap "=" \fImilliseconds\fP
diff --git a/sntp/sntp.html b/sntp/sntp.html
index 0ca2eef3d..6e3c33032 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.
 
-  <p>This document applies to version 4.2.7p310 of <code>sntp</code>.
+  <p>This document applies to version 4.2.7p311 of <code>sntp</code>.
 
   <p>The program implements the SNTP protocol as defined by RFC 5905, the NTPv4
 IETF specification.
@@ -201,7 +201,7 @@ the usage text by passing it through a pager program.
 used to select the program, defaulting to <span class="file">more</span>.  Both will exit
 with a status code of 0.
 
-<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p310
+<pre class="example">sntp - standard Simple Network Time Protocol client program - Ver. 4.2.7p311
 USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ]... \
                 [ hostname-or-IP ...]
   Flg Arg Option-Name    Description
@@ -218,7 +218,7 @@ USAGE:  sntp [ -&lt;flag&gt; [&lt;val&gt;] | --&lt;name&gt;[{=| }&lt;val&gt;] ].
                                 - may appear multiple times
    -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the debug verbosity level
+   -D Num set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -g Num gap            The gap (in milliseconds) between time requests
    -K Fil kod            KoD history filename
diff --git a/sntp/sntp.man.in b/sntp/sntp.man.in
index 2bb3f344c..602debf06 100644
--- a/sntp/sntp.man.in
+++ b/sntp/sntp.man.in
@@ -1,8 +1,8 @@
-.TH sntp @SNTP_MS@ "09 Oct 2012" "4.2.7p310" "User Commands"
+.TH sntp @SNTP_MS@ "10 Oct 2012" "4.2.7p311" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:41:01 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:30:21 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -67,9 +67,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .TP
 .BR \-g " \fImilliseconds\fP, " \-\-gap "=" \fImilliseconds\fP
diff --git a/sntp/sntp.mdoc.in b/sntp/sntp.mdoc.in
index c00039727..63e6758b5 100644
--- a/sntp/sntp.mdoc.in
+++ b/sntp/sntp.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 2012
 .Dt SNTP @SNTP_MS@ User Commands
 .Os SunOS 5.10
 .\"  EDIT THIS FILE WITH CAUTION  (sntp-opts.mdoc)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:41:07 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:30:28 AM by AutoGen 5.16.2
 .\"  From the definitions    sntp-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -67,9 +67,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .sp
-.It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .sp
 .It  \-g " \fImilliseconds\fP, " \-\-gap "=" \fImilliseconds\fP
diff --git a/util/invoke-ntp-keygen.texi b/util/invoke-ntp-keygen.texi
index 52606b603..01277683e 100644
--- a/util/invoke-ntp-keygen.texi
+++ b/util/invoke-ntp-keygen.texi
@@ -6,7 +6,7 @@
 # 
 # EDIT THIS FILE WITH CAUTION  (invoke-ntp-keygen.texi)
 # 
-# It has been AutoGen-ed  October  9, 2012 at 11:40:33 AM by AutoGen 5.16.2
+# It has been AutoGen-ed  October 10, 2012 at 06:29:54 AM by AutoGen 5.16.2
 # From the definitions    ntp-keygen-opts.def
 # and the template file   agtexi-cmd.tpl
 @end ignore
@@ -922,14 +922,14 @@ with a status code of 0.
 
 @exampleindent 0
 @example
-ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p310
+ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p311
 USAGE:  ntp-keygen [ -<flag> [<val>] | --<name>[@{=| @}<val>] ]...
   Flg Arg Option-Name    Description
    -c Str certificate    certificate scheme
    -C Str cipher         privatekey cipher
    -d no  debug-level    Increase debug verbosity level
                                 - may appear multiple times
-   -D Str set-debug-level Set the debug verbosity level
+   -D Num set-debug-level Set the debug verbosity level
                                 - may appear multiple times
    -e no  id-key         Write IFF or GQ identity keys
    -G no  gq-params      Generate GQ parameters and keys
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index c6c42b691..ea9a6351e 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  October  9, 2012 at 11:40:20 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:29:39 AM by AutoGen 5.16.2
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -75,7 +75,7 @@ extern FILE * option_usage_fp;
  *  ntp-keygen option static const strings
  */
 static char const ntp_keygen_opt_strs[2322] =
-/*     0 */ "ntp-keygen (ntp) 4.2.7p310\n"
+/*     0 */ "ntp-keygen (ntp) 4.2.7p311\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"
@@ -163,14 +163,14 @@ static char const ntp_keygen_opt_strs[2322] =
 /*  2100 */ "no-load-opts\0"
 /*  2113 */ "no\0"
 /*  2116 */ "NTP_KEYGEN\0"
-/*  2127 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p310\n"
+/*  2127 */ "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.7p311\n"
             "USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n\0"
 /*  2243 */ "$HOME\0"
 /*  2249 */ ".\0"
 /*  2251 */ ".ntprc\0"
 /*  2258 */ "http://bugs.ntp.org, bugs@ntp.org\0"
 /*  2292 */ "\n\n\0"
-/*  2295 */ "ntp-keygen (ntp) 4.2.7p310";
+/*  2295 */ "ntp-keygen (ntp) 4.2.7p311";
 
 /*
  *  certificate option description:
@@ -221,7 +221,7 @@ static char const ntp_keygen_opt_strs[2322] =
 #define SET_DEBUG_LEVEL_NAME      (ntp_keygen_opt_strs+1126)
 #define SET_DEBUG_LEVEL_name      (ntp_keygen_opt_strs+1142)
 #define SET_DEBUG_LEVEL_FLAGS     (OPTST_DISABLED \
-        | OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
+        | OPTST_SET_ARGTYPE(OPARG_TYPE_NUMERIC))
 
 /*
  *  id-key option description:
@@ -528,7 +528,7 @@ static tOptProc
 /*
  *  #define map the "normal" callout procs to the test ones...
  */
-#define SET_DEBUG_LEVEL_OPT_PROC optionStackArg
+#define DEBUG_LEVEL_OPT_PROC optionStackArg
 
 
 #else /* NOT defined TEST_NTP_KEYGEN_OPTS */
@@ -541,12 +541,12 @@ extern tOptProc
     optionStackArg,        optionTimeDate,        optionTimeVal,
     optionUnstackArg,      optionVendorOption,    optionVersionStderr;
 static tOptProc
-    doOptSet_Debug_Level, doUsageOpt;
+    doOptDebug_Level, doUsageOpt;
 
 /*
  *  #define map the "normal" callout procs
  */
-#define SET_DEBUG_LEVEL_OPT_PROC doOptSet_Debug_Level
+#define DEBUG_LEVEL_OPT_PROC doOptDebug_Level
 
 #endif /* defined(TEST_NTP_KEYGEN_OPTS) */
 #define VER_PROC        ntpOptionPrintVersion
@@ -590,7 +590,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* last opt argumnt */ { NULL }, /* --debug-level */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ NULL,
+     /* option proc      */ DEBUG_LEVEL_OPT_PROC,
      /* desc, NAME, name */ DEBUG_LEVEL_DESC, DEBUG_LEVEL_NAME, DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
@@ -602,7 +602,7 @@ static tOptDesc optDesc[OPTION_CT] = {
      /* last opt argumnt */ { NULL }, /* --set-debug-level */
      /* arg list/cookie  */ NULL,
      /* must/cannot opts */ NULL, NULL,
-     /* option proc      */ SET_DEBUG_LEVEL_OPT_PROC,
+     /* option proc      */ optionNumericVal,
      /* desc, NAME, name */ SET_DEBUG_LEVEL_DESC, SET_DEBUG_LEVEL_NAME, SET_DEBUG_LEVEL_name,
      /* disablement strs */ NULL, NULL },
 
@@ -919,16 +919,17 @@ doUsageOpt(tOptions * pOptions, tOptDesc * pOptDesc)
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /**
- * Code to handle the set-debug-level option.
+ * Code to handle the debug-level option.
  *
  * @param pOptions the ntp-keygen options data structure
  * @param pOptDesc the option descriptor for this option.
  */
 static void
-doOptSet_Debug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
+doOptDebug_Level(tOptions* pOptions, tOptDesc* pOptDesc)
 {
-    /* extracted from debug-opt.def, line 26 */
-DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
+    /* extracted from debug-opt.def, line 15 */
+OPT_VALUE_SET_DEBUG_LEVEL++;
+    (void)pOptDesc;
     (void)pOptions;
 }
 #endif /* defined(TEST_NTP_KEYGEN_OPTS) */
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 5b003ff3f..07bd15ce0 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  October  9, 2012 at 11:40:19 AM by AutoGen 5.16.2
+ *  It has been AutoGen-ed  October 10, 2012 at 06:29:38 AM by AutoGen 5.16.2
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  *
@@ -92,8 +92,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    25
-#define NTP_KEYGEN_VERSION       "4.2.7p310"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p310"
+#define NTP_KEYGEN_VERSION       "4.2.7p311"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) 4.2.7p311"
 
 /*
  *  Interface defines for all options.  Replace "n" with the UPPER_CASED
@@ -241,6 +241,8 @@ typedef enum {
 #define VALUE_OPT_CIPHER         'C'
 #define VALUE_OPT_DEBUG_LEVEL    'd'
 #define VALUE_OPT_SET_DEBUG_LEVEL 'D'
+
+#define OPT_VALUE_SET_DEBUG_LEVEL (DESC(SET_DEBUG_LEVEL).optArg.argInt)
 #define VALUE_OPT_ID_KEY         'e'
 #define VALUE_OPT_GQ_PARAMS      'G'
 #define VALUE_OPT_HOST_KEY       'H'
diff --git a/util/ntp-keygen.1ntp-keygenman b/util/ntp-keygen.1ntp-keygenman
index 5fd3d59af..ef92b147f 100644
--- a/util/ntp-keygen.1ntp-keygenman
+++ b/util/ntp-keygen.1ntp-keygenman
@@ -1,8 +1,8 @@
-.TH ntp-keygen 1ntp-keygenman "09 Oct 2012" "ntp (4.2.7p310)" "User Commands"
+.TH ntp-keygen 1ntp-keygenman "10 Oct 2012" "ntp (4.2.7p311)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:40:29 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:49 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -42,9 +42,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .TP
 .BR \-e ", " -\-id\-key
diff --git a/util/ntp-keygen.1ntp-keygenmdoc b/util/ntp-keygen.1ntp-keygenmdoc
index efe58dfa2..8b75f3056 100644
--- a/util/ntp-keygen.1ntp-keygenmdoc
+++ b/util/ntp-keygen.1ntp-keygenmdoc
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 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  October  9, 2012 at 11:40:35 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:56 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -44,9 +44,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .sp
-.It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .sp
 .It  \-e ", " -\-id\-key
diff --git a/util/ntp-keygen.man.in b/util/ntp-keygen.man.in
index 9b8dc718f..1e874b386 100644
--- a/util/ntp-keygen.man.in
+++ b/util/ntp-keygen.man.in
@@ -1,8 +1,8 @@
-.TH ntp-keygen @NTP_KEYGEN_MS@ "09 Oct 2012" "ntp (4.2.7p310)" "User Commands"
+.TH ntp-keygen @NTP_KEYGEN_MS@ "10 Oct 2012" "ntp (4.2.7p311)" "User Commands"
 .\"
 .\"  EDIT THIS FILE WITH CAUTION  (ntp-keygen-opts.man)
 .\"  
-.\"  It has been AutoGen-ed  October  9, 2012 at 11:40:29 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:49 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman-cmd.tpl
 .\"
@@ -42,9 +42,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .TP
-.BR \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.BR \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .TP
 .BR \-e ", " -\-id\-key
diff --git a/util/ntp-keygen.mdoc.in b/util/ntp-keygen.mdoc.in
index a1d90977b..f5a8e0624 100644
--- a/util/ntp-keygen.mdoc.in
+++ b/util/ntp-keygen.mdoc.in
@@ -1,9 +1,9 @@
-.Dd October 9 2012
+.Dd October 10 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  October  9, 2012 at 11:40:35 AM by AutoGen 5.16.2
+.\"  It has been AutoGen-ed  October 10, 2012 at 06:29:56 AM by AutoGen 5.16.2
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agmdoc-cmd.tpl
 .Sh NAME
@@ -44,9 +44,10 @@ Increase debug verbosity level.
 This option may appear an unlimited number of times.
 .sp
 .sp
-.It  \-D " \fIstring\fP, " \-\-set\-debug\-level "=" \fIstring\fP
+.It  \-D " \fInumber\fP, " \-\-set\-debug\-level "=" \fInumber\fP
 Set the debug verbosity level.
 This option may appear an unlimited number of times.
+This option takes an integer number as its argument.
 .sp
 .sp
 .It  \-e ", " -\-id\-key