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 /lib/libutil | |
| 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 'lib/libutil')
| -rw-r--r-- | lib/libutil/logwtmp.c | 7 | ||||
| -rw-r--r-- | lib/libutil/realhostname.c | 9 |
2 files changed, 3 insertions, 13 deletions
diff --git a/lib/libutil/logwtmp.c b/lib/libutil/logwtmp.c index 03ee4cf..42f3599 100644 --- a/lib/libutil/logwtmp.c +++ b/lib/libutil/logwtmp.c @@ -54,11 +54,6 @@ static char sccsid[] = "@(#)logwtmp.c 8.1 (Berkeley) 6/4/93"; #include <unistd.h> #include <utmp.h> -/* wrapper for KAME-special getnameinfo() */ -#ifndef NI_WITHSCOPEID -#define NI_WITHSCOPEID 0 -#endif - void logwtmp(const char *line, const char *name, const char *host) @@ -86,7 +81,7 @@ logwtmp(const char *line, const char *name, const char *host) else { error = getnameinfo(res->ai_addr, res->ai_addrlen, fullhost, strlen(fullhost), NULL, 0, - NI_NUMERICHOST|NI_WITHSCOPEID); + NI_NUMERICHOST); if (error != 0) { fprintf(stderr, "%d", error); host = "invalid hostname"; diff --git a/lib/libutil/realhostname.c b/lib/libutil/realhostname.c index 6eff893..6a1b82f 100644 --- a/lib/libutil/realhostname.c +++ b/lib/libutil/realhostname.c @@ -39,11 +39,6 @@ __FBSDID("$FreeBSD$"); #include "libutil.h" -/* wrapper for KAME-special getnameinfo() */ -#ifndef NI_WITHSCOPEID -#define NI_WITHSCOPEID 0 -#endif - struct sockinet { u_char si_len; u_char si_family; @@ -119,7 +114,7 @@ realhostname_sa(char *host, size_t hsize, struct sockaddr *addr, int addrlen) #endif error = getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0, - NI_WITHSCOPEID | NI_NAMEREQD); + NI_NAMEREQD); if (error == 0) { struct addrinfo hints, *res, *ores; struct sockaddr *sa; @@ -181,7 +176,7 @@ realhostname_sa(char *host, size_t hsize, struct sockaddr *addr, int addrlen) } else { numeric: if (getnameinfo(addr, addrlen, buf, sizeof(buf), NULL, 0, - NI_NUMERICHOST|NI_WITHSCOPEID) == 0) + NI_NUMERICHOST) == 0) strncpy(host, buf, hsize); } |
