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 | |
| 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')
| -rw-r--r-- | contrib/tcp_wrappers/hosts_access.c | 4 | ||||
| -rw-r--r-- | contrib/tcp_wrappers/socket.c | 12 |
2 files changed, 4 insertions, 12 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)); diff --git a/contrib/tcp_wrappers/socket.c b/contrib/tcp_wrappers/socket.c index 82595c6..ed959ac 100644 --- a/contrib/tcp_wrappers/socket.c +++ b/contrib/tcp_wrappers/socket.c @@ -32,11 +32,7 @@ static char sccsid[] = "@(#) socket.c 1.15 97/03/21 19:27:24"; #include <syslog.h> #include <string.h> -#ifdef INET6 -#ifndef NI_WITHSCOPEID -#define NI_WITHSCOPEID 0 -#endif -#else +#ifndef INET6 extern char *inet_ntoa(); #endif @@ -159,7 +155,7 @@ struct host_info *host; : sizeof(struct sockaddr_in6); #endif getnameinfo(sin, salen, host->addr, sizeof(host->addr), - NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID); + NULL, 0, NI_NUMERICHOST); #else struct sockaddr_in *sin = host->sin; @@ -211,7 +207,7 @@ struct host_info *host; } if (ap) err = getnameinfo(sin, salen, hname, sizeof(hname), - NULL, 0, NI_WITHSCOPEID | NI_NAMEREQD); + NULL, 0, NI_NAMEREQD); } if (!err) { @@ -316,7 +312,7 @@ struct host_info *host; */ getnameinfo(sin, salen, hname, sizeof(hname), - NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID); + NULL, 0, NI_NUMERICHOST); tcpd_warn("host name/address mismatch: %s != %.*s", hname, STRING_LENGTH, (res0->ai_canonname == NULL) ? "" : res0->ai_canonname); |
