From: Harlan Stenn <stenn@ntp.org>
Date: Tue, 15 Aug 2006 09:53:43 +0000 (-0400)
Subject: [Bug 684] debug command-line options should not be shown if #undef DEBUG
X-Git-Tag: NTP_4_2_3P31~3
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e4d7c82b8c7fe4570c55dd29476e3ef26b6a9f44;p=thirdparty%2Fntp.git

[Bug 684] debug command-line options should not be shown if #undef DEBUG

bk: 44e199a7FWlL6i-BZOOWt_wVFO7dSw
---

diff --git a/include/debug-opt.def b/include/debug-opt.def
index 783e5b0b1..2c3da2a63 100644
--- a/include/debug-opt.def
+++ b/include/debug-opt.def
@@ -11,6 +11,7 @@ flag = {
     name      = debug-level;
     value     = d;
     max       = NOLIMIT;
+    ifdef     = DEBUG;
     nopreset;
     descrip   = "Increase output debug message level";
     doc = <<-  _EndOfDoc_
@@ -22,6 +23,7 @@ flag = {
     name      = set-debug-level;
     value     = D;
     max       = NOLIMIT;
+    ifdef     = DEBUG;
     descrip   = "Set the output debug message level";
     arg-type  = string;
     flag-code = 'DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );';
diff --git a/ntpd/ntpd-opts.c b/ntpd/ntpd-opts.c
index ccc6a0a7d..d2799253d 100644
--- a/ntpd/ntpd-opts.c
+++ b/ntpd/ntpd-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpd-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 04:03:36 PM EDT
+ *  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:51:35 AM EDT
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  */
@@ -123,15 +123,25 @@ tSCC    zConfigfile_Name[]         = "configfile";
 /*
  *  Debug_Level option description:
  */
+#ifdef DEBUG
 tSCC    zDebug_LevelText[] =
         "Increase output debug message level";
 tSCC    zDebug_Level_NAME[]        = "DEBUG_LEVEL";
 tSCC    zDebug_Level_Name[]        = "debug-level";
 #define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
 
+#else   /* disable Debug_Level */
+#define VALUE_OPT_DEBUG_LEVEL NO_EQUIVALENT
+#define DEBUG_LEVEL_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zDebug_LevelText       NULL
+#define zDebug_Level_NAME      NULL
+#define zDebug_Level_Name      NULL
+#endif  /* DEBUG */
+
 /*
  *  Set_Debug_Level option description:
  */
+#ifdef DEBUG
 tSCC    zSet_Debug_LevelText[] =
         "Set the output debug message level";
 tSCC    zSet_Debug_Level_NAME[]    = "SET_DEBUG_LEVEL";
@@ -139,6 +149,14 @@ tSCC    zSet_Debug_Level_Name[]    = "set-debug-level";
 #define SET_DEBUG_LEVEL_FLAGS       (OPTST_DISABLED \
 	| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
+#else   /* disable Set_Debug_Level */
+#define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT
+#define SET_DEBUG_LEVEL_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zSet_Debug_LevelText       NULL
+#define zSet_Debug_Level_NAME      NULL
+#define zSet_Debug_Level_Name      NULL
+#endif  /* DEBUG */
+
 /*
  *  Driftfile option description:
  */
@@ -361,6 +379,11 @@ tSCC zNotLoad_Opts_Pfx[]  = "no";
 /*
  *  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,
@@ -385,7 +408,7 @@ static tOptProc
 extern tOptProc
     optionNumericVal, optionPagedUsage, optionPrintVersion, optionStackArg;
 static tOptProc
-    doOptSet_Debug_Level, doUsageOpt;
+    doUsageOpt;
 
 /*
  *  #define map the "normal" callout procs
@@ -811,7 +834,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPD";
 tSCC   zUsageTitle[] =
-"ntpd - NTP daemon program - Ver. 4.2.3p29\n\
+"ntpd - NTP daemon program - Ver. 4.2.3p30\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -879,8 +902,9 @@ doUsageOpt(
 
 /* * * * * * *
  *
- *   For the set-debug-level option.
+ *   For the set-debug-level option, when DEBUG is #define-d.
  */
+#ifdef DEBUG
 static void
 doOptSet_Debug_Level(
     tOptions*   pOptions,
@@ -888,6 +912,7 @@ doOptSet_Debug_Level(
 {
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
+#endif /* defined DEBUG */
 
 #endif /* defined(TEST_NTPD_OPTS) */
 
diff --git a/ntpd/ntpd-opts.h b/ntpd/ntpd-opts.h
index b004f5c9d..f2e5d6dd0 100644
--- a/ntpd/ntpd-opts.h
+++ b/ntpd/ntpd-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpd-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 04:03:35 PM EDT
+ *  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:51:34 AM EDT
  *  From the definitions    ntpd-opts.def
  *  and the template file   options
  */
@@ -87,8 +87,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    33
-#define NTPD_VERSION       "4.2.3p29"
-#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.3p29"
+#define NTPD_VERSION       "4.2.3p30"
+#define NTPD_FULL_VERSION  "ntpd - NTP daemon program - Ver. 4.2.3p30"
 
 /*
  *  Interface defines for all options.  Replace "n" with
@@ -122,8 +122,12 @@ typedef enum {
 #define VALUE_OPT_AUTHNOREQ      'A'
 #define VALUE_OPT_BCASTSYNC      'b'
 #define VALUE_OPT_CONFIGFILE     'c'
+#ifdef DEBUG
 #define VALUE_OPT_DEBUG_LEVEL    'd'
+#endif /* DEBUG */
+#ifdef DEBUG
 #define VALUE_OPT_SET_DEBUG_LEVEL 'D'
+#endif /* DEBUG */
 #define VALUE_OPT_DRIFTFILE      'f'
 #define VALUE_OPT_PANICGATE      'g'
 #define VALUE_OPT_JAILDIR        'i'
diff --git a/ntpd/ntpd-opts.texi b/ntpd/ntpd-opts.texi
index b26710bc9..06c60297e 100644
--- a/ntpd/ntpd-opts.texi
+++ b/ntpd/ntpd-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpd-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 10, 2006 at 04:03:39 PM EDT
+# It has been AutoGen-ed  Tuesday August 15, 2006 at 04:51:37 AM EDT
 # From the definitions    ntpd-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -216,6 +216,8 @@ 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.
@@ -230,6 +232,8 @@ 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,
diff --git a/ntpd/ntpd.1 b/ntpd/ntpd.1
index c50fa02a6..5539c329d 100644
--- a/ntpd/ntpd.1
+++ b/ntpd/ntpd.1
@@ -1,7 +1,7 @@
-.TH NTPD 1 2006-08-10 "( 4.2.3p29)" "Programmer's Manual"
+.TH NTPD 1 2006-08-15 "( 4.2.3p30)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpd.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday August 10, 2006 at 04:03:37 PM EDT
+.\"  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:51:36 AM EDT
 .\"  From the definitions    ntpd-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpd/ntpdbase-opts.def b/ntpd/ntpdbase-opts.def
index 972bb20e3..e5e76ca83 100644
--- a/ntpd/ntpdbase-opts.def
+++ b/ntpd/ntpdbase-opts.def
@@ -1,3 +1,4 @@
+#include autogen-version.def
 
 test-main;
 
diff --git a/ntpd/ntpdsim-opts.c b/ntpd/ntpdsim-opts.c
index 070670b6e..2b8787313 100644
--- a/ntpd/ntpdsim-opts.c
+++ b/ntpd/ntpdsim-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdsim-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 04:03:41 PM EDT
+ *  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:51:39 AM EDT
  *  From the definitions    ntpdsim-opts.def
  *  and the template file   options
  */
@@ -143,15 +143,25 @@ tSCC    zPhasenoise_Name[]         = "phasenoise";
 /*
  *  Debug_Level option description:
  */
+#ifdef DEBUG
 tSCC    zDebug_LevelText[] =
         "Increase output debug message level";
 tSCC    zDebug_Level_NAME[]        = "DEBUG_LEVEL";
 tSCC    zDebug_Level_Name[]        = "debug-level";
 #define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
 
+#else   /* disable Debug_Level */
+#define VALUE_OPT_DEBUG_LEVEL NO_EQUIVALENT
+#define DEBUG_LEVEL_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zDebug_LevelText       NULL
+#define zDebug_Level_NAME      NULL
+#define zDebug_Level_Name      NULL
+#endif  /* DEBUG */
+
 /*
  *  Set_Debug_Level option description:
  */
+#ifdef DEBUG
 tSCC    zSet_Debug_LevelText[] =
         "Set the output debug message level";
 tSCC    zSet_Debug_Level_NAME[]    = "SET_DEBUG_LEVEL";
@@ -159,6 +169,14 @@ tSCC    zSet_Debug_Level_Name[]    = "set-debug-level";
 #define SET_DEBUG_LEVEL_FLAGS       (OPTST_DISABLED \
 	| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
+#else   /* disable Set_Debug_Level */
+#define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT
+#define SET_DEBUG_LEVEL_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zSet_Debug_LevelText       NULL
+#define zSet_Debug_Level_NAME      NULL
+#define zSet_Debug_Level_Name      NULL
+#endif  /* DEBUG */
+
 /*
  *  Driftfile option description:
  */
@@ -451,6 +469,11 @@ tSCC zNotLoad_Opts_Pfx[]  = "no";
 /*
  *  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_NTPDSIM_OPTS)
 /*
  *  Under test, omit argument processing, or call optionStackArg,
@@ -475,7 +498,7 @@ static tOptProc
 extern tOptProc
     optionNumericVal, optionPagedUsage, optionPrintVersion, optionStackArg;
 static tOptProc
-    doOptSet_Debug_Level, doUsageOpt;
+    doUsageOpt;
 
 /*
  *  #define map the "normal" callout procs
@@ -1009,7 +1032,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPDSIM";
 tSCC   zUsageTitle[] =
-"ntpdsim - NTP daemon simulation program - Ver. 4.2.3p29\n\
+"ntpdsim - NTP daemon simulation program - Ver. 4.2.3p30\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -1077,8 +1100,9 @@ doUsageOpt(
 
 /* * * * * * *
  *
- *   For the set-debug-level option.
+ *   For the set-debug-level option, when DEBUG is #define-d.
  */
+#ifdef DEBUG
 static void
 doOptSet_Debug_Level(
     tOptions*   pOptions,
@@ -1086,6 +1110,7 @@ doOptSet_Debug_Level(
 {
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
+#endif /* defined DEBUG */
 
 #endif /* defined(TEST_NTPDSIM_OPTS) */
 
diff --git a/ntpd/ntpdsim-opts.h b/ntpd/ntpdsim-opts.h
index f5942d598..7f0276f5e 100644
--- a/ntpd/ntpdsim-opts.h
+++ b/ntpd/ntpdsim-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdsim-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 04:03:40 PM EDT
+ *  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:51:38 AM EDT
  *  From the definitions    ntpdsim-opts.def
  *  and the template file   options
  */
@@ -96,8 +96,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    42
-#define NTPDSIM_VERSION       "4.2.3p29"
-#define NTPDSIM_FULL_VERSION  "ntpdsim - NTP daemon simulation program - Ver. 4.2.3p29"
+#define NTPDSIM_VERSION       "4.2.3p30"
+#define NTPDSIM_FULL_VERSION  "ntpdsim - NTP daemon simulation program - Ver. 4.2.3p30"
 
 /*
  *  Interface defines for all options.  Replace "n" with
@@ -133,8 +133,12 @@ typedef enum {
 #define VALUE_OPT_SIMBROADCASTDELAY 'B'
 #define VALUE_OPT_CONFIGFILE     'c'
 #define VALUE_OPT_PHASENOISE     'C'
+#ifdef DEBUG
 #define VALUE_OPT_DEBUG_LEVEL    'd'
+#endif /* DEBUG */
+#ifdef DEBUG
 #define VALUE_OPT_SET_DEBUG_LEVEL 'D'
+#endif /* DEBUG */
 #define VALUE_OPT_DRIFTFILE      'f'
 #define VALUE_OPT_PANICGATE      'g'
 #define VALUE_OPT_SIMSLEW        'H'
diff --git a/ntpd/ntpdsim-opts.texi b/ntpd/ntpdsim-opts.texi
index ac5c1bc44..c92628c7d 100644
--- a/ntpd/ntpdsim-opts.texi
+++ b/ntpd/ntpdsim-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpdsim-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 10, 2006 at 04:03:44 PM EDT
+# It has been AutoGen-ed  Tuesday August 15, 2006 at 04:51:42 AM EDT
 # From the definitions    ntpdsim-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -248,6 +248,8 @@ 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.
@@ -262,6 +264,8 @@ 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,
diff --git a/ntpd/ntpdsim.1 b/ntpd/ntpdsim.1
index 60fcc0eab..c2f923833 100644
--- a/ntpd/ntpdsim.1
+++ b/ntpd/ntpdsim.1
@@ -1,7 +1,7 @@
-.TH NTPDSIM 1 2006-08-10 "( 4.2.3p29)" "Programmer's Manual"
+.TH NTPDSIM 1 2006-08-15 "( 4.2.3p30)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpdsim.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday August 10, 2006 at 04:03:42 PM EDT
+.\"  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:51:41 AM EDT
 .\"  From the definitions    ntpdsim-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpdc/ntpdc-opts.c b/ntpdc/ntpdc-opts.c
index aa4a708bf..860aabbfc 100644
--- a/ntpdc/ntpdc-opts.c
+++ b/ntpdc/ntpdc-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdc-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 04:05:25 PM EDT
+ *  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:57:54 AM EDT
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  */
@@ -143,15 +143,25 @@ static const int
 /*
  *  Debug_Level option description:
  */
+#ifdef DEBUG
 tSCC    zDebug_LevelText[] =
         "Increase output debug message level";
 tSCC    zDebug_Level_NAME[]        = "DEBUG_LEVEL";
 tSCC    zDebug_Level_Name[]        = "debug-level";
 #define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
 
+#else   /* disable Debug_Level */
+#define VALUE_OPT_DEBUG_LEVEL NO_EQUIVALENT
+#define DEBUG_LEVEL_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zDebug_LevelText       NULL
+#define zDebug_Level_NAME      NULL
+#define zDebug_Level_Name      NULL
+#endif  /* DEBUG */
+
 /*
  *  Set_Debug_Level option description:
  */
+#ifdef DEBUG
 tSCC    zSet_Debug_LevelText[] =
         "Set the output debug message level";
 tSCC    zSet_Debug_Level_NAME[]    = "SET_DEBUG_LEVEL";
@@ -159,6 +169,14 @@ tSCC    zSet_Debug_Level_Name[]    = "set-debug-level";
 #define SET_DEBUG_LEVEL_FLAGS       (OPTST_DISABLED \
 	| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
+#else   /* disable Set_Debug_Level */
+#define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT
+#define SET_DEBUG_LEVEL_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zSet_Debug_LevelText       NULL
+#define zSet_Debug_Level_NAME      NULL
+#define zSet_Debug_Level_Name      NULL
+#endif  /* DEBUG */
+
 /*
  *  Numeric option description:
  */
@@ -195,6 +213,11 @@ tSCC zNotLoad_Opts_Pfx[]  = "no";
 /*
  *  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_NTPDC_OPTS)
 /*
  *  Under test, omit argument processing, or call optionStackArg,
@@ -218,7 +241,7 @@ static tOptProc
 extern tOptProc
     optionPagedUsage, optionPrintVersion, optionStackArg;
 static tOptProc
-    doOptSet_Debug_Level, doUsageOpt;
+    doUsageOpt;
 
 /*
  *  #define map the "normal" callout procs
@@ -428,7 +451,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPDC";
 tSCC   zUsageTitle[] =
-"ntpdc - vendor-specific NTP query program - Ver. 4.2.3p29\n\
+"ntpdc - vendor-specific NTP query program - Ver. 4.2.3p30\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -511,8 +534,9 @@ doUsageOpt(
 
 /* * * * * * *
  *
- *   For the set-debug-level option.
+ *   For the set-debug-level option, when DEBUG is #define-d.
  */
+#ifdef DEBUG
 static void
 doOptSet_Debug_Level(
     tOptions*   pOptions,
@@ -520,6 +544,7 @@ doOptSet_Debug_Level(
 {
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
+#endif /* defined DEBUG */
 
 #endif /* defined(TEST_NTPDC_OPTS) */
 
diff --git a/ntpdc/ntpdc-opts.h b/ntpdc/ntpdc-opts.h
index 819c498d3..65349788f 100644
--- a/ntpdc/ntpdc-opts.h
+++ b/ntpdc/ntpdc-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpdc-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 04:05:24 PM EDT
+ *  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:57:53 AM EDT
  *  From the definitions    ntpdc-opts.def
  *  and the template file   options
  */
@@ -69,8 +69,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    15
-#define NTPDC_VERSION       "4.2.3p29"
-#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.3p29"
+#define NTPDC_VERSION       "4.2.3p30"
+#define NTPDC_FULL_VERSION  "ntpdc - vendor-specific NTP query program - Ver. 4.2.3p30"
 
 /*
  *  Interface defines for all options.  Replace "n" with
@@ -105,8 +105,12 @@ typedef enum {
 #define VALUE_OPT_PEERS          'p'
 #define VALUE_OPT_SHOWPEERS      's'
 #define VALUE_OPT_INTERACTIVE    'i'
+#ifdef DEBUG
 #define VALUE_OPT_DEBUG_LEVEL    'd'
+#endif /* DEBUG */
+#ifdef DEBUG
 #define VALUE_OPT_SET_DEBUG_LEVEL 'D'
+#endif /* DEBUG */
 #define VALUE_OPT_NUMERIC        'n'
 
 #define VALUE_OPT_VERSION       'v'
diff --git a/ntpdc/ntpdc-opts.texi b/ntpdc/ntpdc-opts.texi
index 4dfcb6e7f..60b01c36f 100644
--- a/ntpdc/ntpdc-opts.texi
+++ b/ntpdc/ntpdc-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpdc-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 10, 2006 at 04:05:27 PM EDT
+# It has been AutoGen-ed  Tuesday August 15, 2006 at 04:57:56 AM EDT
 # From the definitions    ntpdc-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -244,6 +244,8 @@ 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.
@@ -258,6 +260,8 @@ 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,
diff --git a/ntpdc/ntpdc.1 b/ntpdc/ntpdc.1
index c1cdf1c31..dd3e1e757 100644
--- a/ntpdc/ntpdc.1
+++ b/ntpdc/ntpdc.1
@@ -1,7 +1,7 @@
-.TH NTPDC 1 2006-08-10 "( 4.2.3p29)" "Programmer's Manual"
+.TH NTPDC 1 2006-08-15 "( 4.2.3p30)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpdc.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday August 10, 2006 at 04:05:26 PM EDT
+.\"  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:57:55 AM EDT
 .\"  From the definitions    ntpdc-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/ntpq/ntpq-opts.c b/ntpq/ntpq-opts.c
index 0c64d4d83..1872de47f 100644
--- a/ntpq/ntpq-opts.c
+++ b/ntpq/ntpq-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpq-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 06:35:59 PM EDT
+ *  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:58:12 AM EDT
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  */
@@ -88,15 +88,25 @@ tSCC    zCommand_Name[]            = "command";
 /*
  *  Debug_Level option description:
  */
+#ifdef DEBUG
 tSCC    zDebug_LevelText[] =
         "Increase output debug message level";
 tSCC    zDebug_Level_NAME[]        = "DEBUG_LEVEL";
 tSCC    zDebug_Level_Name[]        = "debug-level";
 #define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
 
+#else   /* disable Debug_Level */
+#define VALUE_OPT_DEBUG_LEVEL NO_EQUIVALENT
+#define DEBUG_LEVEL_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zDebug_LevelText       NULL
+#define zDebug_Level_NAME      NULL
+#define zDebug_Level_Name      NULL
+#endif  /* DEBUG */
+
 /*
  *  Set_Debug_Level option description:
  */
+#ifdef DEBUG
 tSCC    zSet_Debug_LevelText[] =
         "Set the output debug message level";
 tSCC    zSet_Debug_Level_NAME[]    = "SET_DEBUG_LEVEL";
@@ -104,6 +114,14 @@ tSCC    zSet_Debug_Level_Name[]    = "set-debug-level";
 #define SET_DEBUG_LEVEL_FLAGS       (OPTST_DISABLED \
 	| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
+#else   /* disable Set_Debug_Level */
+#define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT
+#define SET_DEBUG_LEVEL_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zSet_Debug_LevelText       NULL
+#define zSet_Debug_Level_NAME      NULL
+#define zSet_Debug_Level_Name      NULL
+#endif  /* DEBUG */
+
 /*
  *  Peers option description with
  *  "Must also have options" and "Incompatible options":
@@ -167,6 +185,11 @@ tSCC zNotLoad_Opts_Pfx[]  = "no";
 /*
  *  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_NTPQ_OPTS)
 /*
  *  Under test, omit argument processing, or call optionStackArg,
@@ -190,7 +213,7 @@ static tOptProc
 extern tOptProc
     optionPagedUsage, optionPrintVersion, optionStackArg;
 static tOptProc
-    doOptSet_Debug_Level, doUsageOpt;
+    doUsageOpt;
 
 /*
  *  #define map the "normal" callout procs
@@ -376,7 +399,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTPQ";
 tSCC   zUsageTitle[] =
-"ntpq - standard NTP query program - Ver. 4.2.3p29\n\
+"ntpq - standard NTP query program - Ver. 4.2.3p30\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]... [ host ...]\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -451,8 +474,9 @@ doUsageOpt(
 
 /* * * * * * *
  *
- *   For the set-debug-level option.
+ *   For the set-debug-level option, when DEBUG is #define-d.
  */
+#ifdef DEBUG
 static void
 doOptSet_Debug_Level(
     tOptions*   pOptions,
@@ -460,6 +484,7 @@ doOptSet_Debug_Level(
 {
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
+#endif /* defined DEBUG */
 
 #endif /* defined(TEST_NTPQ_OPTS) */
 
diff --git a/ntpq/ntpq-opts.h b/ntpq/ntpq-opts.h
index e23ea633f..0795a6542 100644
--- a/ntpq/ntpq-opts.h
+++ b/ntpq/ntpq-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntpq-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 06:35:59 PM EDT
+ *  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:58:12 AM EDT
  *  From the definitions    ntpq-opts.def
  *  and the template file   options
  */
@@ -67,8 +67,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    13
-#define NTPQ_VERSION       "4.2.3p29"
-#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.3p29"
+#define NTPQ_VERSION       "4.2.3p30"
+#define NTPQ_FULL_VERSION  "ntpq - standard NTP query program - Ver. 4.2.3p30"
 
 /*
  *  Interface defines for all options.  Replace "n" with
@@ -99,8 +99,12 @@ typedef enum {
 #define WHICH_IDX_IPV4           (DESC(IPV4).optActualIndex)
 #define VALUE_OPT_IPV6           '6'
 #define VALUE_OPT_COMMAND        'c'
+#ifdef DEBUG
 #define VALUE_OPT_DEBUG_LEVEL    'd'
+#endif /* DEBUG */
+#ifdef DEBUG
 #define VALUE_OPT_SET_DEBUG_LEVEL 'D'
+#endif /* DEBUG */
 #define VALUE_OPT_PEERS          'p'
 #define VALUE_OPT_INTERACTIVE    'i'
 #define VALUE_OPT_NUMERIC        'n'
diff --git a/ntpq/ntpq-opts.texi b/ntpq/ntpq-opts.texi
index cdc580bca..970802c55 100644
--- a/ntpq/ntpq-opts.texi
+++ b/ntpq/ntpq-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntpq-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 10, 2006 at 06:46:32 PM EDT
+# It has been AutoGen-ed  Tuesday August 15, 2006 at 04:58:15 AM EDT
 # From the definitions    ntpq-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -392,6 +392,8 @@ 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.
@@ -406,6 +408,8 @@ 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,
diff --git a/ntpq/ntpq.1 b/ntpq/ntpq.1
index a561f4796..cafd8c77e 100644
--- a/ntpq/ntpq.1
+++ b/ntpq/ntpq.1
@@ -1,7 +1,7 @@
-.TH NTPQ 1 2006-08-10 "( 4.2.3p29)" "Programmer's Manual"
+.TH NTPQ 1 2006-08-15 "( 4.2.3p30)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntpq.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday August 10, 2006 at 06:46:31 PM EDT
+.\"  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:58:13 AM EDT
 .\"  From the definitions    ntpq-opts.def
 .\"  and the template file   agman1.tpl
 .\"
diff --git a/sntp/sntp-opts.c b/sntp/sntp-opts.c
index 7c4d5408c..92515db53 100644
--- a/sntp/sntp-opts.c
+++ b/sntp/sntp-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (sntp-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 08:20:34 PM EDT
+ *  It has been AutoGen-ed  Monday August 14, 2006 at 02:58:41 PM EDT
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  */
@@ -481,7 +481,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "SNTP";
 tSCC   zUsageTitle[] =
-"sntp - standard SNTP program - Ver. 4.2.3p29\n\
+"sntp - standard SNTP program - Ver. 4.2.3p30\n\
 USAGE:  %s [ -<flag> | --<name> ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
diff --git a/sntp/sntp-opts.h b/sntp/sntp-opts.h
index d6d132192..ff36badf4 100644
--- a/sntp/sntp-opts.h
+++ b/sntp/sntp-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (sntp-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 08:20:33 PM EDT
+ *  It has been AutoGen-ed  Monday August 14, 2006 at 02:58:40 PM EDT
  *  From the definitions    sntp-opts.def
  *  and the template file   options
  */
@@ -145,8 +145,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    12
-#define SNTP_VERSION       "4.2.3p29"
-#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.3p29"
+#define SNTP_VERSION       "4.2.3p30"
+#define SNTP_FULL_VERSION  "sntp - standard SNTP program - Ver. 4.2.3p30"
 
 /*
  *  Interface defines for all options.  Replace "n" with
diff --git a/sntp/sntp-opts.texi b/sntp/sntp-opts.texi
index 3276d548d..9a6df8e8c 100644
--- a/sntp/sntp-opts.texi
+++ b/sntp/sntp-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (sntp-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 10, 2006 at 08:20:36 PM EDT
+# It has been AutoGen-ed  Monday August 14, 2006 at 02:58:43 PM EDT
 # From the definitions    sntp-opts.def
 # and the template file   aginfo.tpl
 @end ignore
diff --git a/util/ntp-keygen-opts.c b/util/ntp-keygen-opts.c
index 0099362d0..6fc781445 100644
--- a/util/ntp-keygen-opts.c
+++ b/util/ntp-keygen-opts.c
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntp-keygen-opts.c)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 04:19:35 PM EDT
+ *  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:58:35 AM EDT
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  */
@@ -81,15 +81,25 @@ tSCC    zCertificate_Name[]        = "certificate";
 /*
  *  Debug_Level option description:
  */
+#ifdef DEBUG
 tSCC    zDebug_LevelText[] =
         "Increase output debug message level";
 tSCC    zDebug_Level_NAME[]        = "DEBUG_LEVEL";
 tSCC    zDebug_Level_Name[]        = "debug-level";
 #define DEBUG_LEVEL_FLAGS       (OPTST_DISABLED)
 
+#else   /* disable Debug_Level */
+#define VALUE_OPT_DEBUG_LEVEL NO_EQUIVALENT
+#define DEBUG_LEVEL_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zDebug_LevelText       NULL
+#define zDebug_Level_NAME      NULL
+#define zDebug_Level_Name      NULL
+#endif  /* DEBUG */
+
 /*
  *  Set_Debug_Level option description:
  */
+#ifdef DEBUG
 tSCC    zSet_Debug_LevelText[] =
         "Set the output debug message level";
 tSCC    zSet_Debug_Level_NAME[]    = "SET_DEBUG_LEVEL";
@@ -97,6 +107,14 @@ tSCC    zSet_Debug_Level_Name[]    = "set-debug-level";
 #define SET_DEBUG_LEVEL_FLAGS       (OPTST_DISABLED \
 	| OPTST_SET_ARGTYPE(OPARG_TYPE_STRING))
 
+#else   /* disable Set_Debug_Level */
+#define VALUE_OPT_SET_DEBUG_LEVEL NO_EQUIVALENT
+#define SET_DEBUG_LEVEL_FLAGS       (OPTST_OMITTED | OPTST_NO_INIT)
+#define zSet_Debug_LevelText       NULL
+#define zSet_Debug_Level_NAME      NULL
+#define zSet_Debug_Level_Name      NULL
+#endif  /* DEBUG */
+
 /*
  *  Id_Key option description:
  */
@@ -410,6 +428,11 @@ tSCC zNotLoad_Opts_Pfx[]  = "no";
 /*
  *  Declare option callback procedures
  */
+#ifdef DEBUG
+  static tOptProc doOptSet_Debug_Level;
+#else /* not DEBUG */
+# define doOptSet_Debug_Level NULL
+#endif /* def/not DEBUG */
 #ifdef OPENSSL
   static tOptProc doOptModulus;
 #else /* not OPENSSL */
@@ -448,7 +471,7 @@ static tOptProc
 extern tOptProc
     optionPagedUsage, optionPrintVersion;
 static tOptProc
-    doOptSet_Debug_Level, doUsageOpt;
+    doUsageOpt;
 
 /*
  *  #define map the "normal" callout procs
@@ -766,7 +789,7 @@ static tOptDesc optDesc[ OPTION_CT ] = {
  */
 tSCC   zPROGNAME[]   = "NTP_KEYGEN";
 tSCC   zUsageTitle[] =
-"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p29\n\
+"ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p30\n\
 USAGE:  %s [ -<flag> [<val>] | --<name>[{=| }<val>] ]...\n";
 tSCC   zRcName[]     = ".ntprc";
 tSCC*  apzHomeList[] = {
@@ -836,8 +859,9 @@ doUsageOpt(
 
 /* * * * * * *
  *
- *   For the set-debug-level option.
+ *   For the set-debug-level option, when DEBUG is #define-d.
  */
+#ifdef DEBUG
 static void
 doOptSet_Debug_Level(
     tOptions*   pOptions,
@@ -845,6 +869,7 @@ doOptSet_Debug_Level(
 {
 DESC(DEBUG_LEVEL).optOccCt = atoi( pOptDesc->pzLastArg );
 }
+#endif /* defined DEBUG */
 
 #endif /* defined(TEST_NTP_KEYGEN_OPTS) */
 
diff --git a/util/ntp-keygen-opts.h b/util/ntp-keygen-opts.h
index 695164d72..65ccf4bf8 100644
--- a/util/ntp-keygen-opts.h
+++ b/util/ntp-keygen-opts.h
@@ -2,7 +2,7 @@
  *  
  *  DO NOT EDIT THIS FILE   (ntp-keygen-opts.h)
  *  
- *  It has been AutoGen-ed  Thursday August 10, 2006 at 04:19:35 PM EDT
+ *  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:58:34 AM EDT
  *  From the definitions    ntp-keygen-opts.def
  *  and the template file   options
  */
@@ -78,8 +78,8 @@ typedef enum {
 } teOptIndex;
 
 #define OPTION_CT    24
-#define NTP_KEYGEN_VERSION       "4.2.3p29"
-#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p29"
+#define NTP_KEYGEN_VERSION       "4.2.3p30"
+#define NTP_KEYGEN_FULL_VERSION  "ntp-keygen (ntp) - Create a NTP host key - Ver. 4.2.3p30"
 
 /*
  *  Interface defines for all options.  Replace "n" with
@@ -108,8 +108,12 @@ typedef enum {
 #ifdef OPENSSL
 #define VALUE_OPT_CERTIFICATE    'c'
 #endif /* OPENSSL */
+#ifdef DEBUG
 #define VALUE_OPT_DEBUG_LEVEL    'd'
+#endif /* DEBUG */
+#ifdef DEBUG
 #define VALUE_OPT_SET_DEBUG_LEVEL 'D'
+#endif /* DEBUG */
 #ifdef OPENSSL
 #define VALUE_OPT_ID_KEY         'e'
 #endif /* OPENSSL */
diff --git a/util/ntp-keygen-opts.texi b/util/ntp-keygen-opts.texi
index a6318eab6..5300d1cf8 100644
--- a/util/ntp-keygen-opts.texi
+++ b/util/ntp-keygen-opts.texi
@@ -7,7 +7,7 @@
 # 
 # DO NOT EDIT THIS FILE   (ntp-keygen-opts.texi)
 # 
-# It has been AutoGen-ed  Thursday August 10, 2006 at 04:19:37 PM EDT
+# It has been AutoGen-ed  Tuesday August 15, 2006 at 04:58:37 AM EDT
 # From the definitions    ntp-keygen-opts.def
 # and the template file   aginfo.tpl
 @end ignore
@@ -125,6 +125,8 @@ 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.
@@ -139,6 +141,8 @@ 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,
diff --git a/util/ntp-keygen.1 b/util/ntp-keygen.1
index 59220f10f..e89da272b 100644
--- a/util/ntp-keygen.1
+++ b/util/ntp-keygen.1
@@ -1,7 +1,7 @@
-.TH NTP-KEYGEN 1 2006-08-10 "(ntp 4.2.3p29)" "Programmer's Manual"
+.TH NTP-KEYGEN 1 2006-08-15 "(ntp 4.2.3p30)" "Programmer's Manual"
 .\"  DO NOT EDIT THIS FILE   (ntp-keygen.1)
 .\"  
-.\"  It has been AutoGen-ed  Thursday August 10, 2006 at 04:19:37 PM EDT
+.\"  It has been AutoGen-ed  Tuesday August 15, 2006 at 04:58:36 AM EDT
 .\"  From the definitions    ntp-keygen-opts.def
 .\"  and the template file   agman1.tpl
 .\"