From: Remi Tricot-Le Breton <rlebreton@haproxy.com>
Date: Tue, 5 Apr 2022 14:44:21 +0000 (+0200)
Subject: BUG/MINOR: ssl/cli: Remove empty lines from CLI output
X-Git-Tag: v2.6-dev5~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8041fe8bcc95234a210c595912a22078c03472d;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ssl/cli: Remove empty lines from CLI output

There were empty lines in the output of "show ssl ca-file <cafile>" and
"show ssl crl-file <crlfile>" commands when an empty line should only
mark the end of the output. This patch adds a space to those lines.

This patch should be backported to 2.5.
---

diff --git a/src/ssl_ckch.c b/src/ssl_ckch.c
index c047b1c6b2..3bd061090b 100644
--- a/src/ssl_ckch.c
+++ b/src/ssl_ckch.c
@@ -2960,7 +2960,7 @@ static int cli_io_handler_show_cafile_detail(struct appctx *appctx)
 		if (ca_index && ca_index-1 != i)
 			continue;
 
-		chunk_appendf(out, "\nCertificate #%d:\n", i+1);
+		chunk_appendf(out, " \nCertificate #%d:\n", i+1);
 		retval = show_cert_detail(cert, NULL, out);
 		if (retval < 0)
 			goto end_no_putchk;
@@ -3619,7 +3619,7 @@ static int cli_io_handler_show_crlfile_detail(struct appctx *appctx)
 		if (index && index-1 != i)
 			continue;
 
-		chunk_appendf(out, "\nCertificate Revocation List #%d:\n", i+1);
+		chunk_appendf(out, " \nCertificate Revocation List #%d:\n", i+1);
 		retval = show_crl_detail(crl, out);
 		if (retval < 0)
 			goto end_no_putchk;