pullup:

 987.   [bug]           "dig -help" didn't show "+[no]stats".

 986.   [bug]           "dig +noall" failed to clear stats and command
                        printing.

diff --git a/CHANGES b/CHANGES
index aa44f18b3d7d51970e578347e6e6e1a0015e2a73..34e773cbd577c0827cb5d283d59104b801239268 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,9 @@
 
+ 987.  [bug]           "dig -help" didn't show "+[no]stats".
+
+ 986.  [bug]           "dig +noall" failed to clear stats and command
+                       printing.
+
  980.  [bug]           Incoming zone transfers restarting after an error
                        could trigger an assertion failure. [RT #1692]
 

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index faac6fbdb3bd4d5190f5bd15b439dae682f5e3f8..43329fdddde5def466b3b914cadfff2db913a5c6 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.131.2.4 2001/03/14 18:08:48 bwelling Exp $ */
+/* $Id: dig.c,v 1.131.2.5 2001/09/11 01:39:28 gson Exp $ */
 
 #include <config.h>
 #include <stdlib.h>
@@ -172,6 +172,7 @@ show_usage(void) {
 "                 +[no]answer         (Control display of answer)\n"
 "                 +[no]authority      (Control display of authority)\n"
 "                 +[no]additional     (Control display of additional)\n"
+"                 +[no]stats          (Control display of statistics)\n"
 "                 +[no]short          (Disable everything except short\n"
 "                                      form of answer)\n"
 "                 +[no]all            (Set or clear all display flags)\n"
@@ -650,6 +651,8 @@ plus_option(char *option, isc_boolean_t is_batchfile,
                        lookup->section_answer = state;
                        lookup->section_additional = state;
                        lookup->comments = state;
+                       lookup->stats = state;
+                       printcmd = state;
                        break;
                case 'n': /* answer */
                        lookup->section_answer = state;