diff options
| author | ume <ume@FreeBSD.org> | 2005-05-13 16:31:11 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2005-05-13 16:31:11 +0000 |
| commit | e33ba033454acbec171e04edba1395842e412b5c (patch) | |
| tree | 9ae1266a1a3de18e5409202ab088ec8928d3410e /contrib/tcp_wrappers/hosts_access.c | |
| parent | 4c5083a81ce14f96f4193b746c54f7e17d94e21b (diff) | |
| download | FreeBSD-src-e33ba033454acbec171e04edba1395842e412b5c.zip FreeBSD-src-e33ba033454acbec171e04edba1395842e412b5c.tar.gz | |
NI_WITHSCOPEID cleanup. Neither RFC 2553 nor RFC 3493 defines
NI_WITHSCOPEID, and our getaddrinfo(3) does nothing special
for it, now.
Diffstat (limited to 'contrib/tcp_wrappers/hosts_access.c')
| -rw-r--r-- | contrib/tcp_wrappers/hosts_access.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/contrib/tcp_wrappers/hosts_access.c b/contrib/tcp_wrappers/hosts_access.c index 24f5753..8220e64 100644 --- a/contrib/tcp_wrappers/hosts_access.c +++ b/contrib/tcp_wrappers/hosts_access.c @@ -366,11 +366,9 @@ char *string; return NO; memcpy(&addr, res->ai_addr, sizeof(addr)); freeaddrinfo(res); -#ifdef NI_WITHSCOPEID if (pat.sin6_scope_id != 0 && addr.sin6_scope_id != pat.sin6_scope_id) return NO; -#endif return (!memcmp(&pat.sin6_addr, &addr.sin6_addr, sizeof(struct in6_addr))); return (ret); @@ -472,10 +470,8 @@ char *string; if ((mask_len = atoi(mask_tok)) < 0 || mask_len > 128) return NO; -#ifdef NI_WITHSCOPEID if (net.sin6_scope_id != 0 && addr.sin6_scope_id != net.sin6_scope_id) return NO; -#endif while (mask_len > 0) { if (mask_len < 32) { mask = htonl(~(0xffffffff >> mask_len)); |
