From: Willy Tarreau <w@1wt.eu>
Date: Wed, 8 Nov 2017 13:25:59 +0000 (+0100)
Subject: BUILD: ssl: fix build of backend without ssl
X-Git-Tag: v1.8-rc3~16
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=46c9d3e6cb47822b6372c6bb538a47ced8ad0141;p=thirdparty%2Fhaproxy.git

BUILD: ssl: fix build of backend without ssl

Commit 522eea7 ("MINOR: ssl: Handle sending early data to server.") added
a dependency on SRV_SSL_O_EARLY_DATA which only exists when USE_OPENSSL
is defined (which is probably not the best solution) and breaks the build
when ssl is not enabled. Just add an ifdef USE_OPENSSL around the block
for now.
---

diff --git a/src/backend.c b/src/backend.c
index ca064b6953..c8c2b9dea8 100644
--- a/src/backend.c
+++ b/src/backend.c
@@ -1209,6 +1209,7 @@ int connect_server(struct stream *s)
 
 	err = si_connect(&s->si[1]);
 
+#ifdef USE_OPENSSL
 	if (!reuse && cli_conn && srv &&
 	    (srv->ssl_ctx.options & SRV_SSL_O_EARLY_DATA) &&
 		    (cli_conn->flags & CO_FL_EARLY_DATA) &&
@@ -1217,6 +1218,7 @@ int connect_server(struct stream *s)
 		srv_conn->flags &= ~(CO_FL_SSL_WAIT_HS | CO_FL_WAIT_L6_CONN);
 		srv_conn->flags |= CO_FL_EARLY_SSL_HS;
 	}
+#endif
 
 	if (err != SF_ERR_NONE)
 		return err;