From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 27 Apr 2020 09:17:10 +0000 (+0200)
Subject: BUG/MINOR: server: Fix server_finalize_init() to avoid unused variable
X-Git-Tag: v2.1.5~9
X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=c3d01347cc06179a1f126e7e772a2b41b477b2ba;p=haproxy-2.1.git

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.]
---

diff --git a/src/server.c b/src/server.c
index 380339c..7d44921 100644
--- a/src/server.c
+++ b/src/server.c
@@ -1896,7 +1896,9 @@ static int server_sni_expr_init(const char *file, int linenum, char **args, int
 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",