From: William Lallemand <wlallemand@haproxy.com>
Date: Mon, 14 Oct 2019 09:12:35 +0000 (+0200)
Subject: BUG/MINOR: ssl: fix build without SSL
X-Git-Tag: v2.1-dev3~84
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e0c51ae3589d2ba5ad7c80d38a9e44384757dbb7;p=thirdparty%2Fhaproxy.git

BUG/MINOR: ssl: fix build without SSL

Commits 222a7c6 and 150bfa8 introduced some SSL initialization in
bind_conf_alloc() which broke the build without SSL.

Issue #322.
---

diff --git a/include/proto/listener.h b/include/proto/listener.h
index 3648882b12..2336e63462 100644
--- a/include/proto/listener.h
+++ b/include/proto/listener.h
@@ -157,10 +157,11 @@ static inline struct bind_conf *bind_conf_alloc(struct proxy *fe, const char *fi
 	bind_conf->xprt = xprt;
 	bind_conf->frontend = fe;
 	bind_conf->severity_output = CLI_SEVERITY_NONE;
+#ifdef USE_OPENSSL
 	HA_RWLOCK_INIT(&bind_conf->sni_lock);
 	bind_conf->sni_ctx = EB_ROOT;
 	bind_conf->sni_w_ctx = EB_ROOT;
-
+#endif
 	LIST_INIT(&bind_conf->listeners);
 	return bind_conf;
 }