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/isccfg/parser.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/isccfg/parser.c')
| -rw-r--r-- | usr.sbin/bind/lib/isccfg/parser.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/usr.sbin/bind/lib/isccfg/parser.c b/usr.sbin/bind/lib/isccfg/parser.c index 8e5128b1c14..ecf17cd6c42 100644 --- a/usr.sbin/bind/lib/isccfg/parser.c +++ b/usr.sbin/bind/lib/isccfg/parser.c @@ -2084,7 +2084,6 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) { if (inet_pton(AF_INET6, buf, &in6a) == 1) { if (d != NULL) { -#ifdef ISC_PLATFORM_HAVESCOPEID isc_result_t result; result = isc_netscope_pton(AF_INET6, @@ -2093,9 +2092,6 @@ token_addr(cfg_parser_t *pctx, unsigned int flags, isc_netaddr_t *na) { &zone); if (result != ISC_R_SUCCESS) return (result); -#else - return (ISC_R_BADADDRESSFORM); -#endif } isc_netaddr_fromin6(na, &in6a); |