always check 'printcmd' before printing cmdline message

(cherry picked from commit 6d50f7d92453ff10ecaf0c7af32d74073e448b31)

diff --git a/bin/dig/dig.c b/bin/dig/dig.c
index ad2bc2dbed23b0631c78c2a114e981593ce8775d..455fc28656fd9e842c32201f5b43b09924f1be40 100644 (file)
--- a/bin/dig/dig.c
+++ b/bin/dig/dig.c
@@ -565,8 +565,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",
@@ -588,7 +589,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");