From: William Lallemand <wlallemand@haproxy.org>
Date: Mon, 28 Sep 2020 13:45:16 +0000 (+0200)
Subject: BUG/MINOR: ssl/crt-list: exit on warning out of crtlist_parse_line()
X-Git-Tag: v2.3-dev6~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=20b0fed28cc0e5d890dc441ffc73b95ceb25c8d2;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ssl/crt-list: exit on warning out of crtlist_parse_line()

We should not exits on error out of the crtlist_parse_line() function.
The cfgerr error must be checked with the ERR_CODE mask.

Must be backported in 2.2.
---

diff --git a/src/ssl_crtlist.c b/src/ssl_crtlist.c
index f7007efc6c..fd141fc506 100644
--- a/src/ssl_crtlist.c
+++ b/src/ssl_crtlist.c
@@ -495,7 +495,7 @@ int crtlist_parse_file(char *file, struct bind_conf *bind_conf, struct proxy *cu
 		if (*(end - 1) == '\n')
 			*(end - 1) = '\0'; /* line parser mustn't receive any \n */
 		cfgerr |= crtlist_parse_line(thisline, &crt_path, entry, file, linenum, err);
-		if (cfgerr)
+		if (cfgerr & ERR_CODE)
 			goto error;
 
 		/* empty line */