diff options
| author |   florian <florian@openbsd.org> | 2020-01-09 13:45:33 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2020-01-09 13:45:33 +0000 |
| commit | 3d11ce0c9019bf0eb8ee99f5a9b088fc6febe363 (patch) | |
| tree | d7ed8d04fb3e623e5b0154f396089b9933cee0ac /usr.sbin/bind/lib/isc/netaddr.c | |
| parent | Move peer related code from rde.c to rde_peer.c. (diff) | |
| download | wireguard-openbsd-3d11ce0c9019bf0eb8ee99f5a9b088fc6febe363.tar.xz wireguard-openbsd-3d11ce0c9019bf0eb8ee99f5a9b088fc6febe363.zip | |
unifdef network defines:
#define ISC_PLATFORM_HAVESALEN 1
#define ISC_PLATFORM_HAVEIPV6 1
#undef ISC_PLATFORM_NEEDIN6ADDRANY
#undef ISC_PLATFORM_NEEDIN6ADDRLOOPBACK
#define ISC_PLATFORM_HAVEIN6PKTINFO 1
#undef ISC_PLATFORM_HAVEINADDR6
#define ISC_PLATFORM_HAVESCOPEID 1
#undef ISC_PLATFORM_NEEDNTOP
#undef ISC_PLATFORM_NEEDPTON
#undef ISC_PLATFORM_NEEDPORTT
#undef ISC_PLATFORM_HAVELIFCONF
#undef ISC_PLATFORM_HAVEIF_LADDRCONF
#undef ISC_PLATFORM_HAVEIF_LADDRREQ
#define ISC_NET_BSD44MSGHDR 1
#define ISC_PLATFORM_HAVEIFNAMETOINDEX 1
#undef ISC_PLATFORM_FIXIN6ISADDR
#define ISC_PLATFORM_HAVESOCKADDRSTORAGE 1
#define ISC_PLATFORM_HAVEKQUEUE 1
#undef ISC_PLATFORM_HAVEEPOLL
#undef ISC_PLATFORM_HAVEDEVPOLL
prodding deraadt@
Diffstat (limited to 'usr.sbin/bind/lib/isc/netaddr.c')
| -rw-r--r-- | usr.sbin/bind/lib/isc/netaddr.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/usr.sbin/bind/lib/isc/netaddr.c b/usr.sbin/bind/lib/isc/netaddr.c index d3e27df0dca..b76ae3cf21d 100644 --- a/usr.sbin/bind/lib/isc/netaddr.c +++ b/usr.sbin/bind/lib/isc/netaddr.c @@ -14,7 +14,7 @@ * PERFORMANCE OF THIS SOFTWARE. */ -/* $Id: netaddr.c,v 1.4 2019/12/17 01:46:34 sthen Exp $ */ +/* $Id: netaddr.c,v 1.5 2020/01/09 13:45:33 florian Exp $ */ /*! \file */ @@ -340,11 +340,7 @@ isc_netaddr_fromsockaddr(isc_netaddr_t *t, const isc_sockaddr_t *s) { break; case AF_INET6: memmove(&t->type.in6, &s->type.sin6.sin6_addr, 16); -#ifdef ISC_PLATFORM_HAVESCOPEID t->zone = s->type.sin6.sin6_scope_id; -#else - t->zone = 0; -#endif break; #ifdef ISC_PLATFORM_HAVESYSUNH case AF_UNIX: |