2477 [bug] dig: the global option to print the command line is

                        +cmd not print_cmd.  Update the output to reflect
                        this. [RT #17008]

diff --git a/CHANGES b/CHANGES
index ec17bf07821ce6920613939eca43c4d8c8dd1d3d..939a31b405eb0bf873395e6cd74299e1cbb2ceb5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+2477   [bug]           dig: the global option to print the command line is
+                       +cmd not print_cmd.  Update the output to reflect
+                       this. [RT #17008]
+
 2476.  [doc]           ARM: improve documentation for max-journal-size and
                        ixfr-from-differences. [RT #15909] [RT #18541]
 

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 236603ae50008a1f9a20c2af5beb9e69b9b17271..1b3d127796fbee67a0356873cba2b274866dfcca 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: dig.c,v 1.223 2008/10/15 02:16:51 marka Exp $ */
+/* $Id: dig.c,v 1.224 2008/10/28 03:32:59 marka Exp $ */
 
 /*! \file */
 
@@ -641,9 +641,9 @@ printgreeting(int argc, char **argv, dig_lookup_t *lookup) {
                }
                if (first) {
                        snprintf(append, sizeof(append),
-                                ";; global options: %s %s\n",
-                              short_form ? "short_form" : "",
-                              printcmd ? "printcmd" : "");
+                                ";; global options:%s%s\n",
+                                short_form ? " +short" : "",
+                                printcmd ? " +cmd" : "");
                        first = ISC_FALSE;
                        remaining = sizeof(lookup->cmdline) -
                                    strlen(lookup->cmdline) - 1;