From: Evan Hunt <each@isc.org>
Date: Mon, 29 Jul 2019 23:06:59 +0000 (-0700)
Subject: always check 'printcmd' before printing cmdline message
X-Git-Tag: v9.14.5~9^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=4caffaaad29f5d05619b9c2d86aff2e80d911c74;p=thirdparty%2Fbind9.git

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 b7cfd6921ed..e3c6108a9fe 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");