diff options
| author |   florian <florian@openbsd.org> | 2020-01-09 14:18:29 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2020-01-09 14:18:29 +0000 |
| commit | 41167cd8bc04424f91ae678f20274da3fc9edb62 (patch) | |
| tree | 7f29915d631f25ced9618cfc6b7529b23ce53f6e /usr.sbin/bind/lib/isc/netaddr.c | |
| parent | unifdef gss-api: (diff) | |
| download | wireguard-openbsd-41167cd8bc04424f91ae678f20274da3fc9edb62.tar.xz wireguard-openbsd-41167cd8bc04424f91ae678f20274da3fc9edb62.zip | |
Assorted unifdefs:
#define ISC_PLATFORM_NEEDSYSSELECTH 1
#define ISC_PLATFORM_HAVESTATNSEC 1
#define ISC_PLATFORM_RLIMITTYPE rlim_t
#define ISC_PLATFORM_HAVELONGLONG 1
#undef ISC_PLATFORM_BRACEPTHREADONCEINIT
#undef ISC_PLATFORM_USEDECLSPEC
#define ISC_PLATFORM_HAVESYSUNH 1
#define ISC_PLATFORM_HAVESTRINGSH 1
#define ISC_PLATFORM_WANTAES 1
#define ISC_PLATFORM_USESIT 1
#define LIBISC_EXTERNAL_DATA
#define LIBDNS_EXTERNAL_DATA
#define LIBISCCFG_EXTERNAL_DATA
#define LIBBIND9_EXTERNAL_DATA
#define LIBTESTS_EXTERNAL_DATA
prodding deraadt@
Diffstat (limited to 'usr.sbin/bind/lib/isc/netaddr.c')
| -rw-r--r-- | usr.sbin/bind/lib/isc/netaddr.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/usr.sbin/bind/lib/isc/netaddr.c b/usr.sbin/bind/lib/isc/netaddr.c index db741a07ce1..c8b28900aa5 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.6 2020/01/09 13:47:13 florian Exp $ */ +/* $Id: netaddr.c,v 1.7 2020/01/09 14:18:30 florian Exp $ */ /*! \file */ @@ -52,12 +52,10 @@ isc_netaddr_equal(const isc_netaddr_t *a, const isc_netaddr_t *b) { a->zone != b->zone) return (ISC_FALSE); break; -#ifdef ISC_PLATFORM_HAVESYSUNH case AF_UNIX: if (strcmp(a->type.un, b->type.un) != 0) return (ISC_FALSE); break; -#endif default: return (ISC_FALSE); } @@ -140,7 +138,6 @@ isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target) { case AF_INET6: type = &netaddr->type.in6; break; -#ifdef ISC_PLATFORM_HAVESYSUNH case AF_UNIX: alen = strlen(netaddr->type.un); if (alen > isc_buffer_availablelength(target)) @@ -149,7 +146,6 @@ isc_netaddr_totext(const isc_netaddr_t *netaddr, isc_buffer_t *target) { (const unsigned char *)(netaddr->type.un), alen); return (ISC_R_SUCCESS); -#endif default: return (ISC_R_FAILURE); } @@ -299,7 +295,6 @@ isc_netaddr_fromin6(isc_netaddr_t *netaddr, const struct in6_addr *ina6) { isc_result_t isc_netaddr_frompath(isc_netaddr_t *netaddr, const char *path) { -#ifdef ISC_PLATFORM_HAVESYSUNH if (strlen(path) > sizeof(netaddr->type.un) - 1) return (ISC_R_NOSPACE); @@ -308,11 +303,6 @@ isc_netaddr_frompath(isc_netaddr_t *netaddr, const char *path) { strlcpy(netaddr->type.un, path, sizeof(netaddr->type.un)); netaddr->zone = 0; return (ISC_R_SUCCESS); -#else - UNUSED(netaddr); - UNUSED(path); - return (ISC_R_NOTIMPLEMENTED); -#endif } @@ -342,12 +332,10 @@ isc_netaddr_fromsockaddr(isc_netaddr_t *t, const isc_sockaddr_t *s) { memmove(&t->type.in6, &s->type.sin6.sin6_addr, 16); t->zone = s->type.sin6.sin6_scope_id; break; -#ifdef ISC_PLATFORM_HAVESYSUNH case AF_UNIX: memmove(t->type.un, s->type.sunix.sun_path, sizeof(t->type.un)); t->zone = 0; break; -#endif default: INSIST(0); } |