]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: ssl: fix build without SSL
authorWilliam Lallemand <wlallemand@haproxy.com>
Mon, 14 Oct 2019 09:12:35 +0000 (11:12 +0200)
committerWilliam Lallemand <wlallemand@haproxy.org>
Mon, 14 Oct 2019 09:24:17 +0000 (11:24 +0200)
Commits 222a7c6 and 150bfa8 introduced some SSL initialization in
bind_conf_alloc() which broke the build without SSL.

Issue #322.

include/proto/listener.h

index 3648882b126ff53b2d90cfd07ab68cdefd59117c..2336e63462f3c0a5e31c4c19cb682fbb0d855e3e 100644 (file)
@@ -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;
 }