From 7ef908f6aafd522979d4950ea468ff9d9c6e3c0a Mon Sep 17 00:00:00 2001 From: ume Date: Fri, 13 May 2005 16:43:28 +0000 Subject: NI_WITHSCOPEID cleanup Reviewed by: gad --- usr.sbin/lpr/common_source/net.c | 4 ++-- usr.sbin/lpr/lpd/lpd.c | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'usr.sbin/lpr') diff --git a/usr.sbin/lpr/common_source/net.c b/usr.sbin/lpr/common_source/net.c index 3ae3e90..2a1e0c8 100644 --- a/usr.sbin/lpr/common_source/net.c +++ b/usr.sbin/lpr/common_source/net.c @@ -230,13 +230,13 @@ checkremote(struct printer *pp) for (lr = local_res; lr; lr = lr->ai_next) { h1[0] = '\0'; if (getnameinfo(lr->ai_addr, lr->ai_addrlen, h1, sizeof(h1), - NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID) != 0) + NULL, 0, NI_NUMERICHOST) != 0) continue; for (rr = remote_res; rr; rr = rr->ai_next) { h2[0] = '\0'; if (getnameinfo(rr->ai_addr, rr->ai_addrlen, h2, sizeof(h2), NULL, 0, - NI_NUMERICHOST | NI_WITHSCOPEID) != 0) + NI_NUMERICHOST) != 0) continue; if (strcmp(h1, h2) == 0) ncommonaddrs++; diff --git a/usr.sbin/lpr/lpd/lpd.c b/usr.sbin/lpr/lpd/lpd.c index e02839a..51a228b 100644 --- a/usr.sbin/lpr/lpd/lpd.c +++ b/usr.sbin/lpr/lpd/lpd.c @@ -675,7 +675,7 @@ chkhost(struct sockaddr *f, int ch_opts) if (error) { errsav = error; error = getnameinfo(f, f->sa_len, hostbuf, sizeof(hostbuf), - NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID); + NULL, 0, NI_NUMERICHOST); if (error) { asprintf(&syserr, "can not determine hostname for remote host (%d,%d)", @@ -701,7 +701,7 @@ chkhost(struct sockaddr *f, int ch_opts) /* Need address in stringform for comparison (no DNS lookup here) */ error = getnameinfo(f, f->sa_len, hostbuf, sizeof(hostbuf), NULL, 0, - NI_NUMERICHOST | NI_WITHSCOPEID); + NI_NUMERICHOST); if (error) { asprintf(&syserr, "Cannot print IP address (error %d)", error); @@ -743,7 +743,7 @@ chkhost(struct sockaddr *f, int ch_opts) good = 0; for (r = res; good == 0 && r; r = r->ai_next) { error = getnameinfo(r->ai_addr, r->ai_addrlen, ip, sizeof(ip), - NULL, 0, NI_NUMERICHOST | NI_WITHSCOPEID); + NULL, 0, NI_NUMERICHOST); if (!error && !strcmp(from_ip, ip)) good = 1; } -- cgit v1.1