RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG/MINOR: ssl: ssl_sock_prepare_ssl_ctx does not return an error code 

The return value check was wrongly based on error codes when the
function actually returns an error number.
This bug was introduced by f3eedfe195
which is a feature not present before branch 2.4.

It does not need to be backported.
This commit is contained in:
Remi Tricot-Le Breton 2021-04-21 15:32:46 +02:00 committed by William Lallemand
parent bf1bd5a2a8
commit 43899ec83d
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ssl_ckch.c
View File

@ -1259,6 +1259,7 @@ static int cli_io_handler_commit_cert(struct appctx *appctx)
int y = 0;
char *err = NULL;
int errcode = 0;
int retval = 0;
struct ckch_store *old_ckchs, *new_ckchs = NULL;
struct ckch_inst *ckchi, *ckchis;
struct buffer *trash = alloc_trash_chunk();
@ -1337,8 +1338,8 @@ static int cli_io_handler_commit_cert(struct appctx *appctx)
new_inst->server = ckchi->server;
/* Create a new SSL_CTX and link it to the new instance. */
if (new_inst->is_server_instance) {
errcode |= ssl_sock_prepare_srv_ssl_ctx(ckchi->server, new_inst->ctx);
if (errcode & ERR_CODE)
retval = ssl_sock_prepare_srv_ssl_ctx(ckchi->server, new_inst->ctx);
if (retval)
goto error;
}