Commit 9998b32c authored Mar 17, 2017 by Matt Caswell

Fix no-dtls builds



Commits f2ff1432 in master and 14d4d7ed 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)

parent 3fb2c3e4

apps/s_server.c

+6 −1

Original line number	Diff line number	Diff line
		@@ -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