diff options
| author |   jsing <jsing@openbsd.org> | 2014-07-08 11:08:37 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-07-08 11:08:37 +0000 |
| commit | cc7c479b719eb44fcb126008fab6b0a71762bdb8 (patch) | |
| tree | 80c6709bcef2497247d37dba2a7b65ccf439434a | |
| parent | We have EAI_FAMILY - remove the #ifdefs. (diff) | |
| download | wireguard-openbsd-cc7c479b719eb44fcb126008fab6b0a71762bdb8.tar.xz wireguard-openbsd-cc7c479b719eb44fcb126008fab6b0a71762bdb8.zip | |
Pretty much everything has SO_REUSEADDR - nuke the #ifdefs.
ok beck@
| -rw-r--r-- | lib/libcrypto/bio/b_sock.c | 6 | ||||
| -rw-r--r-- | lib/libssl/src/crypto/bio/b_sock.c | 6 |
2 files changed, 2 insertions, 10 deletions
diff --git a/lib/libcrypto/bio/b_sock.c b/lib/libcrypto/bio/b_sock.c index ad261f065a7..e14e7fedf8c 100644 --- a/lib/libcrypto/bio/b_sock.c +++ b/lib/libcrypto/bio/b_sock.c @@ -1,4 +1,4 @@ -/* $OpenBSD: b_sock.c,v 1.47 2014/07/08 11:05:41 jsing Exp $ */ +/* $OpenBSD: b_sock.c,v 1.48 2014/07/08 11:08:37 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -310,7 +310,6 @@ again: goto err; } -#ifdef SO_REUSEADDR if (bind_mode == BIO_BIND_REUSEADDR) { int i = 1; @@ -318,9 +317,7 @@ again: sizeof(i)); bind_mode = BIO_BIND_NORMAL; } -#endif if (bind(s, &server.sa, addrlen) == -1) { -#ifdef SO_REUSEADDR err_num = errno; if ((bind_mode == BIO_BIND_REUSEADDR_IF_UNUSED) && (err_num == EADDRINUSE)) { @@ -350,7 +347,6 @@ again: } /* else error */ } -#endif SYSerr(SYS_F_BIND, err_num); ERR_asprintf_error_data("port='%s'", host); BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, diff --git a/lib/libssl/src/crypto/bio/b_sock.c b/lib/libssl/src/crypto/bio/b_sock.c index ad261f065a7..e14e7fedf8c 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.47 2014/07/08 11:05:41 jsing Exp $ */ +/* $OpenBSD: b_sock.c,v 1.48 2014/07/08 11:08:37 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -310,7 +310,6 @@ again: goto err; } -#ifdef SO_REUSEADDR if (bind_mode == BIO_BIND_REUSEADDR) { int i = 1; @@ -318,9 +317,7 @@ again: sizeof(i)); bind_mode = BIO_BIND_NORMAL; } -#endif if (bind(s, &server.sa, addrlen) == -1) { -#ifdef SO_REUSEADDR err_num = errno; if ((bind_mode == BIO_BIND_REUSEADDR_IF_UNUSED) && (err_num == EADDRINUSE)) { @@ -350,7 +347,6 @@ again: } /* else error */ } -#endif SYSerr(SYS_F_BIND, err_num); ERR_asprintf_error_data("port='%s'", host); BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET, |