diff options
| author | Hajimu UMEMOTO <ume@FreeBSD.org> | 2005-05-13 16:31:11 +0000 |
|---|---|---|
| committer | Hajimu UMEMOTO <ume@FreeBSD.org> | 2005-05-13 16:31:11 +0000 |
| commit | 4f101318489d72d2eeada2463a8fc3d105855628 (patch) | |
| tree | 9ae1266a1a3de18e5409202ab088ec8928d3410e /usr.sbin/mountd | |
| parent | 8dcb56dc7885d7310299a09a04fb5334f8d75d7a (diff) | |
NI_WITHSCOPEID cleanup. Neither RFC 2553 nor RFC 3493 defines
NI_WITHSCOPEID, and our getaddrinfo(3) does nothing special
for it, now.
Notes
Notes:
svn path=/head/; revision=146187
Diffstat (limited to 'usr.sbin/mountd')
| -rw-r--r-- | usr.sbin/mountd/mountd.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 54dfd6970572..bd57299033b9 100644 --- a/usr.sbin/mountd/mountd.c +++ b/usr.sbin/mountd/mountd.c @@ -227,11 +227,6 @@ int got_sighup = 0; int opt_flags; static int have_v6 = 1; -#ifdef NI_WITHSCOPEID -static const int ninumeric = NI_NUMERICHOST | NI_WITHSCOPEID; -#else -static const int ninumeric = NI_NUMERICHOST; -#endif int mountdlockfd; /* Bits for opt_flags above */ @@ -1692,7 +1687,7 @@ get_host(cp, grp, tgrp) while (ai != NULL) { if (ai->ai_canonname == NULL) { if (getnameinfo(ai->ai_addr, ai->ai_addrlen, host, - sizeof host, NULL, 0, ninumeric) != 0) + sizeof host, NULL, 0, NI_NUMERICHOST) != 0) strlcpy(host, "?", sizeof(host)); ai->ai_canonname = strdup(host); ai->ai_flags |= AI_CANONNAME; @@ -2009,7 +2004,7 @@ get_net(cp, net, maskflg) if (np) { name = np->n_name; } else if (getnameinfo(sa, sa->sa_len, netname, sizeof netname, - NULL, 0, ninumeric) == 0) { + NULL, 0, NI_NUMERICHOST) == 0) { name = netname; } else { goto fail; |