always check 'printcmd' before printing cmdline message

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index 8e535ca69a68e92c8f4f19f5bd0c6948f662a791..984ec1eaf87423a4446cab42974c42fced1a8527 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -505,8 +505,9 @@ printmessage(dig_query_t *query, dns_message_t *msg, bool headers) {
        check_result(result, "dns_master_stylecreate");
 
        if (query->lookup->cmdline[0] != 0) {
-               if (!short_form)
+               if (!short_form && printcmd) {
                        fputs(query->lookup->cmdline, stdout);
+               }
                query->lookup->cmdline[0]=0;
        }
        debug("printmessage(%s %s %s)", headers ? "headers" : "noheaders",
@@ -529,7 +530,7 @@ printmessage(dig_query_t *query, dns_message_t *msg, bool headers) {
        check_result(result, "isc_buffer_allocate");
 
        if (query->lookup->comments && !short_form) {
-               if (query->lookup->cmdline[0] != 0)
+               if (query->lookup->cmdline[0] != 0 && printcmd)
                        printf("; %s\n", query->lookup->cmdline);
                if (msg == query->lookup->sendmsg)
                        printf(";; Sending:\n");