From 9998b32cb63b0bdd3d014abfa1d70e9a2c20a283 Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 17 Mar 2017 10:21:25 +0000 Subject: [PATCH] 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 (Merged from https://github.com/openssl/openssl/pull/2974) --- apps/s_server.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/s_server.c b/apps/s_server.c index 12792e9643..5858278b46 100644 --- 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 -- 2.25.1