From: William Dauchy <w.dauchy@criteo.com>
Date: Sun, 24 Nov 2019 14:04:20 +0000 (+0100)
Subject: CLEANUP: ssl: check if a transaction exists once before setting it
X-Git-Tag: v2.1.0~14
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c8bb1539cb5f644295141c5219942ff02c279e8a;p=thirdparty%2Fhaproxy.git

CLEANUP: ssl: check if a transaction exists once before setting it

trivial patch to fix issue #351

Fixes: bc6ca7ccaa72 ("MINOR: ssl/cli: rework 'set ssl cert' as 'set/commit'")
Reported-by: Илья Шипицин <chipitsine@gmail.com>
Signed-off-by: William Dauchy <w.dauchy@criteo.com>
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index cd04c344a5..62b9de95c3 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -10468,7 +10468,7 @@ static int cli_parse_set_cert(char **args, char *payload, struct appctx *appctx,
 	/* we succeed, we can save the ckchs in the transaction */
 
 	/* if there wasn't a transaction, update the old ckchs */
-	if (!ckchs_transaction.old_ckchs && !ckchs_transaction.old_ckchs) {
+	if (!ckchs_transaction.old_ckchs) {
 		ckchs_transaction.old_ckchs = appctx->ctx.ssl.old_ckchs;
 		ckchs_transaction.path = appctx->ctx.ssl.path;
 		err = memprintf(&err, "Transaction created for certificate %s!\n", ckchs_transaction.path);