diff --git a/apps/s_socket.c b/apps/s_socket.c
index f73f1931e50529a0495b354aab8dac9410c25acf..d83eecb6dedfae47b6a4f2175f533f22b59c8292 100644
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -298,7 +298,11 @@ int do_server(int port, int type, int *ret, int (*cb)(char *hostname, int s, uns
   		{
 		if (type==SOCK_STREAM)
 			{
+#ifdef OPENSSL_SSL_DEBUG_BROKEN_PROTOCOL
+			if (do_accept(accept_socket,&sock,NULL) == 0)
+#else
 			if (do_accept(accept_socket,&sock,&name) == 0)
+#endif
 				{
 				SHUTDOWN(accept_socket);
 				return(0);