Re: [PATCH v2] CLEANUP: ssl: check if a transaction exists once before setting it

2019-11-25 Thread William Lallemand
On Sun, Nov 24, 2019 at 03:04:20PM +0100, William Dauchy wrote:
> trivial patch to fix issue #351
> 
> Fixes: bc6ca7ccaa72 ("MINOR: ssl/cli: rework 'set ssl cert' as 'set/commit'")
> Reported-by: Илья Шипицин 
> Signed-off-by: William Dauchy 
> ---
>  src/ssl_sock.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/src/ssl_sock.c b/src/ssl_sock.c
> index bcfa3e71..0848dc7c 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(, "Transaction created for certificate 
> %s!\n", ckchs_transaction.path);
> -- 
> 2.24.0
> 

Thanks, merged!

-- 
William Lallemand



[PATCH v2] CLEANUP: ssl: check if a transaction exists once before setting it

2019-11-24 Thread William Dauchy
trivial patch to fix issue #351

Fixes: bc6ca7ccaa72 ("MINOR: ssl/cli: rework 'set ssl cert' as 'set/commit'")
Reported-by: Илья Шипицин 
Signed-off-by: William Dauchy 
---
 src/ssl_sock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index bcfa3e71..0848dc7c 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(, "Transaction created for certificate 
%s!\n", ckchs_transaction.path);
-- 
2.24.0