From e33ba033454acbec171e04edba1395842e412b5c Mon Sep 17 00:00:00 2001 From: ume Date: Fri, 13 May 2005 16:31:11 +0000 Subject: NI_WITHSCOPEID cleanup. Neither RFC 2553 nor RFC 3493 defines NI_WITHSCOPEID, and our getaddrinfo(3) does nothing special for it, now. --- usr.sbin/mountd/mountd.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'usr.sbin/mountd') diff --git a/usr.sbin/mountd/mountd.c b/usr.sbin/mountd/mountd.c index 54dfd69..bd57299 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; -- cgit v1.1