On 03/29/2017 02:35 PM, Frederic Lecaille wrote:
Hello Willy,

As I began to work on server template feature, I found a bug in patch
#0019 (due to a copy and paste again).

Here is a new patch.

Sorry for this one.

Fred

Here is a patch which fixes this bug, to be merged with current haproxy sources.
>From 779867f29c5ca6c2e22e352811c0dbc99a2a96fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20L=C3=A9caille?= <[email protected]>
Date: Wed, 29 Mar 2017 14:58:09 +0200
Subject: [PATCH] BUG/MEDIUM: server: Wrong server default CRT filenames
 initialization.
X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4

This patch fixes a bug which came with 5e57643 commit where server
default CRT filenames were initialized to the same value as server
default CRL filenames.
---
 src/server.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/server.c b/src/server.c
index eedd878..0795e25 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1832,7 +1832,7 @@ int parse_server(const char *file, int linenum, char **args, struct proxy *curpr
 			if (curproxy->defsrv.ssl_ctx.crl_file != NULL)
 				newsrv->ssl_ctx.crl_file = strdup(curproxy->defsrv.ssl_ctx.crl_file);
 			if (curproxy->defsrv.ssl_ctx.client_crt != NULL)
-				newsrv->ssl_ctx.client_crt = strdup(curproxy->defsrv.ssl_ctx.crl_file);
+				newsrv->ssl_ctx.client_crt = strdup(curproxy->defsrv.ssl_ctx.client_crt);
 			newsrv->ssl_ctx.verify = curproxy->defsrv.ssl_ctx.verify;
 			if (curproxy->defsrv.ssl_ctx.verify_host != NULL)
 				newsrv->ssl_ctx.verify_host = strdup(curproxy->defsrv.ssl_ctx.verify_host);
-- 
2.1.4

Reply via email to