From: Mark Andrews <marka@isc.org>
Date: Wed, 23 Dec 2020 01:21:24 +0000 (+1100)
Subject: Fix dnssec-signzone and dnssec-verify logging
X-Git-Tag: v9.16.11~8^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76a08eef9d9822ae5f7addc78a6594ff4a2190b5;p=thirdparty%2Fbind9.git

Fix dnssec-signzone and dnssec-verify logging

The newlines need to be appended to the messages generated by report
in a atomic manner.

(cherry picked from commit c36bd83822582fcd0084a36d2eebc555f5e1c2d9)
---

diff --git a/bin/dnssec/dnssec-signzone.c b/bin/dnssec/dnssec-signzone.c
index e6c36ac6991..f6c79831bc9 100644
--- a/bin/dnssec/dnssec-signzone.c
+++ b/bin/dnssec/dnssec-signzone.c
@@ -2727,10 +2727,13 @@ static void
 report(const char *format, ...) {
 	if (!quiet) {
 		FILE *out = output_stdout ? stderr : stdout;
+		char buf[4096];
 		va_list args;
+
 		va_start(args, format);
-		vfprintf(out, format, args);
+		vsnprintf(buf, sizeof(buf), format, args);
 		va_end(args);
+		fprintf(out, "%s\n", buf);
 	}
 }
 
diff --git a/bin/dnssec/dnssec-verify.c b/bin/dnssec/dnssec-verify.c
index e986168ed41..711db8cbe44 100644
--- a/bin/dnssec/dnssec-verify.c
+++ b/bin/dnssec/dnssec-verify.c
@@ -81,10 +81,13 @@ static bool keyset_kskonly = false;
 static void
 report(const char *format, ...) {
 	if (!quiet) {
+		char buf[4096];
 		va_list args;
+
 		va_start(args, format);
-		vfprintf(stdout, format, args);
+		vsnprintf(buf, sizeof(buf), format, args);
 		va_end(args);
+		fprintf(stdout, "%s\n", buf);
 	}
 }