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)

diff --git a/apps/s_server.c b/apps/s_server.c
index 12792e9643ffc0a4c5f83a36898c10e91b7f78df..5858278b466fb791312f58cfd7399734adf619d2 100644 (file)
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -138,9 +138,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;
+
 static int early_data = 0;
 
 #ifndef OPENSSL_NO_PSK