]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: ssl/crt-list: exit on warning out of crtlist_parse_line()
authorWilliam Lallemand <wlallemand@haproxy.org>
Mon, 28 Sep 2020 13:45:16 +0000 (15:45 +0200)
committerWilliam Lallemand <wlallemand@haproxy.org>
Mon, 28 Sep 2020 13:48:54 +0000 (15:48 +0200)
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.

src/ssl_crtlist.c

index f7007efc6c7596e8b40edb0aaf3458fba5b1cfd6..fd141fc5063485ed25af8f03ed8c04edef579b5b 100644 (file)
@@ -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 */