summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorderaadt <>2014-04-19 13:13:01 +0000
committerderaadt <>2014-04-19 13:13:01 +0000
commit4208104cba46786606cd522b3b0f9b2d5a6a65a2 (patch)
treec2f3bda38972f16159b6c28547e827804e8e482b /src
parent94b01fb1dea0219d681a8f31b420537fd56a8a20 (diff)
downloadopenbsd-4208104cba46786606cd522b3b0f9b2d5a6a65a2.tar.gz
openbsd-4208104cba46786606cd522b3b0f9b2d5a6a65a2.tar.bz2
openbsd-4208104cba46786606cd522b3b0f9b2d5a6a65a2.zip
Remove hacky workaround for Cray T3E.
ok guenther
Diffstat (limited to 'src')
-rw-r--r--src/lib/libssl/src/apps/s_socket.c11
1 files changed, 0 insertions, 11 deletions
diff --git a/src/lib/libssl/src/apps/s_socket.c b/src/lib/libssl/src/apps/s_socket.c
index b77cb9008b..baf6078a2b 100644
--- a/src/lib/libssl/src/apps/s_socket.c
+++ b/src/lib/libssl/src/apps/s_socket.c
@@ -201,12 +201,7 @@ init_server_long(int *sock, int port, char *ip, int type)
201 if (ip == NULL) 201 if (ip == NULL)
202 server.sin_addr.s_addr = INADDR_ANY; 202 server.sin_addr.s_addr = INADDR_ANY;
203 else 203 else
204/* Added for T3E, address-of fails on bit field (beckman@acl.lanl.gov) */
205#ifndef BIT_FIELD_LIMITS
206 memcpy(&server.sin_addr.s_addr, ip, 4); 204 memcpy(&server.sin_addr.s_addr, ip, 4);
207#else
208 memcpy(&server.sin_addr, ip, 4);
209#endif
210 205
211 if (type == SOCK_STREAM) 206 if (type == SOCK_STREAM)
212 s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL); 207 s = socket(AF_INET, SOCK_STREAM, SOCKET_PROTOCOL);
@@ -289,14 +284,8 @@ redoit:
289 284
290 if (host == NULL) 285 if (host == NULL)
291 goto end; 286 goto end;
292#ifndef BIT_FIELD_LIMITS
293 /* I should use WSAAsyncGetHostByName() under windows */
294 h1 = gethostbyaddr((char *) &from.sin_addr.s_addr, 287 h1 = gethostbyaddr((char *) &from.sin_addr.s_addr,
295 sizeof(from.sin_addr.s_addr), AF_INET); 288 sizeof(from.sin_addr.s_addr), AF_INET);
296#else
297 h1 = gethostbyaddr((char *) &from.sin_addr,
298 sizeof(struct in_addr), AF_INET);
299#endif
300 if (h1 == NULL) { 289 if (h1 == NULL) {
301 BIO_printf(bio_err, "bad gethostbyaddr\n"); 290 BIO_printf(bio_err, "bad gethostbyaddr\n");
302 *host = NULL; 291 *host = NULL;