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 a3ee4d68f5a555e565d858feed002c23720c1ce6..7e18aaf0f89ac6e4c2ea167e2735b81c7932e876 100644 (file)
--- 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 */