stop use of NI_WITHSCOPEID. it was deprecated.

Obtained from:	KAME

1 files changed, 7 insertions, 16 deletions

diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c
index 8b93a84..deab0ef 100644
--- a/usr.sbin/traceroute6/traceroute6.c
+++ b/usr.sbin/traceroute6/traceroute6.c
@@ -368,12 +368,6 @@ int waittime = 5;		/* time to wait for response (in seconds) */
 int nflag;			/* print addresses numerically */
 int lflag;			/* print both numerical address & hostname */
 
-#ifdef KAME_SCOPEID
-const int niflag = NI_WITHSCOPEID;
-#else
-const int niflag = 0;
-#endif
-
 int
 main(argc, argv)
 	int argc;
@@ -793,8 +787,7 @@ main(argc, argv)
 			exit(1);
 		}
 		if (getnameinfo((struct sockaddr *)&Src, Src.sin6_len,
-				src0, sizeof(src0), NULL, 0,
-				NI_NUMERICHOST | niflag)) {
+		    src0, sizeof(src0), NULL, 0, NI_NUMERICHOST)) {
 			Fprintf(stderr, "getnameinfo failed for source\n");
 			exit(1);
 		}
@@ -828,7 +821,7 @@ main(argc, argv)
 	 * Message to users
 	 */
 	if (getnameinfo((struct sockaddr *)&Dst, Dst.sin6_len, hbuf,
-			sizeof(hbuf), NULL, 0, NI_NUMERICHOST | niflag))
+	    sizeof(hbuf), NULL, 0, NI_NUMERICHOST))
 		strlcpy(hbuf, "(invalid)", sizeof(hbuf));
 	Fprintf(stderr, "traceroute6");
 	Fprintf(stderr, " to %s (%s)", hostname, hbuf);
@@ -1114,8 +1107,7 @@ packet_ok(mhdr, cc, seq)
 	if (cc < hlen + sizeof(struct icmp6_hdr)) {
 		if (verbose) {
 			if (getnameinfo((struct sockaddr *)from, from->sin6_len,
-			    hbuf, sizeof(hbuf), NULL, 0,
-			    NI_NUMERICHOST | niflag) != 0)
+			    hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
 				strlcpy(hbuf, "invalid", sizeof(hbuf));
 			Printf("packet too short (%d bytes) from %s\n", cc,
 			    hbuf);
@@ -1128,8 +1120,7 @@ packet_ok(mhdr, cc, seq)
 	if (cc < sizeof(struct icmp6_hdr)) {
 		if (verbose) {
 			if (getnameinfo((struct sockaddr *)from, from->sin6_len,
-			    hbuf, sizeof(hbuf), NULL, 0,
-			    NI_NUMERICHOST | niflag) != 0)
+			    hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
 				strlcpy(hbuf, "invalid", sizeof(hbuf));
 			Printf("data too short (%d bytes) from %s\n", cc, hbuf);
 		}
@@ -1187,7 +1178,7 @@ packet_ok(mhdr, cc, seq)
 		char sbuf[NI_MAXHOST+1], dbuf[INET6_ADDRSTRLEN];
 
 		if (getnameinfo((struct sockaddr *)from, from->sin6_len,
-		    sbuf, sizeof(sbuf), NULL, 0, NI_NUMERICHOST | niflag) != 0)
+		    sbuf, sizeof(sbuf), NULL, 0, NI_NUMERICHOST) != 0)
 			strlcpy(sbuf, "invalid", sizeof(hbuf));
 		Printf("\n%d bytes from %s to %s", cc, sbuf,
 		    rcvpktinfo ? inet_ntop(AF_INET6, &rcvpktinfo->ipi6_addr,
@@ -1266,7 +1257,7 @@ print(mhdr, cc)
 	char hbuf[NI_MAXHOST];
 
 	if (getnameinfo((struct sockaddr *)from, from->sin6_len,
-	    hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST | niflag) != 0)
+	    hbuf, sizeof(hbuf), NULL, 0, NI_NUMERICHOST) != 0)
 		strlcpy(hbuf, "invalid", sizeof(hbuf));
 	if (nflag)
 		Printf(" %s", hbuf);
@@ -1342,7 +1333,7 @@ inetname(sa)
 		return cp;
 
 	if (getnameinfo(sa, sa->sa_len, line, sizeof(line), NULL, 0,
-	    NI_NUMERICHOST | niflag) != 0)
+	    NI_NUMERICHOST) != 0)
 		strlcpy(line, "invalid", sizeof(line));
 	return line;
 }