From: deraadt <deraadt@openbsd.org>
Date: Sat, 19 Apr 2014 13:13:01 +0000 (+0000)
Subject: Remove hacky workaround for Cray T3E.
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e38d8a9085111d57c7ab9fbabd3426a9a28e2d5a;p=openbsd

Remove hacky workaround for Cray T3E.
ok guenther
---

diff --git a/lib/libssl/src/apps/s_socket.c b/lib/libssl/src/apps/s_socket.c
index b77cb9008bf..baf6078a2b5 100644
--- a/lib/libssl/src/apps/s_socket.c
+++ b/lib/libssl/src/apps/s_socket.c
@@ -201,12 +201,7 @@ init_server_long(int *sock, int port, char *ip, int type)
 	if (ip == NULL)
 		server.sin_addr.s_addr = INADDR_ANY;
 	else
-/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
-#ifndef BIT_FIELD_LIMITS
 		memcpy(&server.sin_addr.s_addr, ip, 4);
-#else
-		memcpy(&server.sin_addr, ip, 4);
-#endif
 
 	if (type == SOCK_STREAM)
 		s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL);
@@ -289,14 +284,8 @@ redoit:
 
 	if (host == NULL)
 		goto end;
-#ifndef BIT_FIELD_LIMITS
-	/* I should use WSAAsyncGetHostByName() under windows */
 	h1 = gethostbyaddr((char *) &from.sin_addr.s_addr,
 	    sizeof(from.sin_addr.s_addr), AF_INET);
-#else
-	h1 = gethostbyaddr((char *) &from.sin_addr,
-	    sizeof(struct in_addr), AF_INET);
-#endif
 	if (h1 == NULL) {
 		BIO_printf(bio_err, "bad gethostbyaddr\n");
 		*host = NULL;