From: Matt Caswell <matt@openssl.org>
Date: Fri, 17 Mar 2017 10:21:25 +0000 (+0000)
Subject: Fix no-dtls builds
X-Git-Tag: OpenSSL_1_1_0f~140
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=79037e85140887276476e03ce941b1ff0382543d;p=oweals%2Fopenssl.git

Fix no-dtls builds

Commits f2ff1432f in master and 14d4d7eda in 1.1.0 broke the no-dtls build
by moving the position of a "#endif" for OPENSSL_NO_DTLS in a change
which is otherwise unrelated to DTLS. This puts it back to where it was.

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/2974)
(cherry picked from commit 9998b32cb63b0bdd3d014abfa1d70e9a2c20a283)
---

diff --git a/apps/s_server.c b/apps/s_server.c
index a3ee4d68f5..7e18aaf0f8 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -137,9 +137,14 @@ static const char *session_id_prefix = NULL;
 #ifndef OPENSSL_NO_DTLS
 static int enable_timeouts = 0;
 static long socket_mtu;
-static int dtlslisten = 0;
 #endif
 
+/*
+ * We define this but make it always be 0 in no-dtls builds to simplify the
+ * code.
+ */
+static int dtlslisten = 0;
+
 #ifndef OPENSSL_NO_PSK
 static const char psk_identity[] = "Client_identity";
 char *psk_key = NULL;           /* by default PSK is not used */