From: Christopher Faulet <cfaulet@haproxy.com>
Date: Thu, 23 Nov 2017 08:13:32 +0000 (+0100)
Subject: BUG/MINOR: Use crt_base instead of ca_base when crt is parsed on a server line
X-Git-Tag: v1.8.0~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff3a41eb3f990ee1cc25a5fa961fe8e490254d0c;p=thirdparty%2Fhaproxy.git

BUG/MINOR: Use crt_base instead of ca_base when crt is parsed on a server line

In srv_parse_crt, crt_base was checked but ca_base was used to build the
certifacte path.

This patch must be backported in 1.7, 1.6 and 1.5.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index 24bb368771..0fca243d2a 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -7714,7 +7714,7 @@ static int srv_parse_crt(char **args, int *cur_arg, struct proxy *px, struct ser
 	}
 
 	if ((*args[*cur_arg + 1] != '/') && global_ssl.crt_base)
-		memprintf(&newsrv->ssl_ctx.client_crt, "%s/%s", global_ssl.ca_base, args[*cur_arg + 1]);
+		memprintf(&newsrv->ssl_ctx.client_crt, "%s/%s", global_ssl.crt_base, args[*cur_arg + 1]);
 	else
 		memprintf(&newsrv->ssl_ctx.client_crt, "%s", args[*cur_arg + 1]);