From: Willy Tarreau <w@1wt.eu>
Date: Mon, 20 Jun 2016 21:01:57 +0000 (+0200)
Subject: BUILD: ssl: fix typo causing a build failure in the multicert patch
X-Git-Tag: v1.7-dev4~65
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24b892f32441369bf7b5b6c2c017ee7ff732f23b;p=thirdparty%2Fhaproxy.git

BUILD: ssl: fix typo causing a build failure in the multicert patch

I just noticed that SSL wouldn't build anymore since this afternoon's patch :

src/ssl_sock.c: In function 'ssl_sock_load_multi_cert':
src/ssl_sock.c:1982:26: warning: left-hand operand of comma expression has no effect [-Wunused-value]
    for (i = 0; i < fcount, i++)
                          ^
src/ssl_sock.c:1982:31: error: expected ';' before ')' token
    for (i = 0; i < fcount, i++)
                               ^
Makefile:791: recipe for target 'src/ssl_sock.o' failed
make: *** [src/ssl_sock.o] Error 1
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index e0a1616657..6635d5c848 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -1979,7 +1979,7 @@ static int ssl_sock_load_multi_cert(const char *path, struct bind_conf *bind_con
 			continue;
 
 		if (fcount) {
-			for (i = 0; i < fcount, i++)
+			for (i = 0; i < fcount; i++)
 				ssl_sock_populate_sni_keytypes_hplr(sni_filter[i], &sni_keytypes_map, n);
 		} else {
 			/* A lot of the following code is OpenSSL boilerplate for processing CN's and SAN's,