diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-08 11:05:42 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2014-07-08 11:05:42 +0000 |
| commit | b38a677568c2e45b52fcdb0af334d99d39976eaf (patch) | |
| tree | f48eeb36a307132777d8869a9b718e9a6bf1c3c7 /lib | |
| parent | 604d5fc4ecde264621b3e19958d4b9052b7e1687 (diff) | |
We have EAI_FAMILY - remove the #ifdefs.
ok beck@
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libssl/src/crypto/bio/b_sock.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/lib/libssl/src/crypto/bio/b_sock.c b/lib/libssl/src/crypto/bio/b_sock.c index 8fea0b7f8f7..ad261f065a7 100644 --- a/lib/libssl/src/crypto/bio/b_sock.c +++ b/lib/libssl/src/crypto/bio/b_sock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_sock.c,v 1.46 2014/07/08 10:12:48 jsing Exp $ */ +/* $OpenBSD: b_sock.c,v 1.47 2014/07/08 11:05:41 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -247,7 +247,6 @@ BIO_get_accept_socket(char *host, int bind_mode) else p = h, h = NULL; -#ifdef EAI_FAMILY do { struct addrinfo *res, hint; @@ -280,7 +279,6 @@ BIO_get_accept_socket(char *host, int bind_mode) freeaddrinfo(res); goto again; } while (0); -#endif if (!BIO_get_port(p, &port)) goto err; @@ -407,7 +405,6 @@ BIO_accept(int sock, char **addr) if (addr == NULL) goto end; -#ifdef EAI_FAMILY do { char h[NI_MAXHOST], s[NI_MAXSERV]; size_t nl; @@ -441,7 +438,6 @@ BIO_accept(int sock, char **addr) snprintf(*addr, nl, "%s:%s", h, s); goto end; } while (0); -#endif if (sa.from.sa.sa_family != AF_INET) goto end; l = ntohl(sa.from.sa_in.sin_addr.s_addr); |