mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-10 17:17:06 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MINOR: ssl_ckch: Dump CRL transaction only once if show command yield

Browse Source 
When loaded CRL files are displayed via "show ssl crl-file" command, the
in-progess transaction, if any, is also displayed. However, if the command
yield, the transaction is re-displayed again and again.

To fix the issue, old_crlfile_entry field is used to remember the transaction
was already displayed.

This patch must be backported as far as 2.5.
This commit is contained in:
Christopher Faulet 2022-06-03 10:32:18 +02:00
parent 51095ee236
commit 9a99e54787
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/ssl_ckch.c
View File

@ -3762,11 +3762,12 @@ static int cli_io_handler_show_crlfile(struct appctx *appctx)
if (trash == NULL) if (trash == NULL)
return 1; return 1;
if (!ctx->old_crlfile_entry) { if (!ctx->old_crlfile_entry && crlfile_transaction.old_crlfile_entry) {
if (crlfile_transaction.old_crlfile_entry) { chunk_appendf(trash, "# transaction\n");
chunk_appendf(trash, "# transaction\n"); chunk_appendf(trash, "*%s\n", crlfile_transaction.old_crlfile_entry->path);
chunk_appendf(trash, "*%s\n", crlfile_transaction.old_crlfile_entry->path); if (applet_putchk(appctx, trash) == -1)
} goto yield;
ctx->old_crlfile_entry = crlfile_transaction.old_crlfile_entry;
} }
/* First time in this io_handler. */ /* First time in this io_handler. */