From: Willy Tarreau <w@1wt.eu>
Date: Thu, 4 Jan 2018 17:55:19 +0000 (+0100)
Subject: BUILD: ssl: silence a warning when building without NPN nor ALPN support
X-Git-Tag: v1.9-dev1~530
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d4cafb6105ac70b57de1df2358efd5ab3844f2f;p=thirdparty%2Fhaproxy.git

BUILD: ssl: silence a warning when building without NPN nor ALPN support

When building with a library not offering any of these, ssl_conf_cur
is not used.

Can be backported to 1.8.
---

diff --git a/src/ssl_sock.c b/src/ssl_sock.c
index f9d5f25675..163b6a13fe 100644
--- a/src/ssl_sock.c
+++ b/src/ssl_sock.c
@@ -4044,7 +4044,7 @@ int ssl_sock_prepare_ctx(struct bind_conf *bind_conf, struct ssl_bind_conf *ssl_
 	struct proxy *curproxy = bind_conf->frontend;
 	int cfgerr = 0;
 	int verify = SSL_VERIFY_NONE;
-	struct ssl_bind_conf *ssl_conf_cur;
+	struct ssl_bind_conf __maybe_unused *ssl_conf_cur;
 	const char *conf_ciphers;
 	const char *conf_curves = NULL;