From 4caffaaad29f5d05619b9c2d86aff2e80d911c74 Mon Sep 17 00:00:00 2001 From: Evan Hunt Date: Mon, 29 Jul 2019 16:06:59 -0700 Subject: [PATCH] always check 'printcmd' before printing cmdline message (cherry picked from commit 6d50f7d92453ff10ecaf0c7af32d74073e448b31) --- bin/dig/dig.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/bin/dig/dig.c b/bin/dig/dig.c index b7cfd6921e..e3c6108a9f 100644 --- a/bin/dig/dig.c +++ b/bin/dig/dig.c @@ -502,8 +502,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", @@ -526,7 +527,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");