commit 1ebb12ce377d97b3ff146daeaa04209693baba2b
author Christopher Faulet <cfaulet@haproxy.com> Mon Apr 27 11:17:10 2020 +0200
committer Christopher Faulet <cfaulet@haproxy.com> Mon May 25 17:45:31 2020 +0200
tree 7306f3243c3c70ba84f2b246a4f7f8efa98f70b9
parent 98bfaf782ed0a02f5dc6384b644ee20da769f63d

BUG/MINOR: server: Fix server_finalize_init() to avoid unused variable

The variable 'ret' must only be declared When HAProxy is compiled with the SSL
support (more precisely SSL_CTRL_SET_TLSEXT_HOSTNAME must be defined).

No backport needed.

(cherry picked from commit b3b53524addbea79f5928b0bd5c58fd201a3e828)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
[Cf: The patch fixes a bug introduced by the commit 8892e5d3. Thus it must be
     backported to the same versions.]
(cherry picked from commit c3d01347cc06179a1f126e7e772a2b41b477b2ba)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>

src/server.c

diff --git a/src/server.c b/src/server.c
index 580baf8..851f32a 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1888,7 +1888,9 @@
 static int server_finalize_init(const char *file, int linenum, char **args, int cur_arg,
                                 struct server *srv, struct proxy *px)
 {
+#ifdef SSL_CTRL_SET_TLSEXT_HOSTNAME
 	int ret;
+#endif
 
 	if (srv->do_check && srv->trackit) {
 		ha_alert("parsing [%s:%d]: unable to enable checks and tracking at the same time!\n",