stop use of NI_WITHSCOPEID. it was deprecated.

Obtained from:	KAME

3 files changed, 3 insertions, 16 deletions

diff --git a/lib/libc/net/getnameinfo.3 b/lib/libc/net/getnameinfo.3
index bf197dca1d12..88c39148489f 100644
--- a/lib/libc/net/getnameinfo.3
+++ b/lib/libc/net/getnameinfo.3
@@ -178,16 +178,11 @@ These
 flags are defined in
 .In netdb.h .
 .\"
-.Sh EXTENSION
+.Ss Extension for scoped IPv6 address
 The implementation allows experimental numeric IPv6 address notation with
 scope identifier.
-IPv6 link-local address will appear as string like
-.Dq Li fe80::1%ne0 ,
-if
-.Dv NI_WITHSCOPEID
-bit is enabled in
-.Fa flags
-argument.
+IPv6 link-local address will appear as a string like
+.Dq Li fe80::1%ne0 .
 Refer to
 .Xr getaddrinfo 3
 for the notation.
diff --git a/lib/libipsec/ipsec_dump_policy.c b/lib/libipsec/ipsec_dump_policy.c
index 721ff207200b..98d16aa35693 100644
--- a/lib/libipsec/ipsec_dump_policy.c
+++ b/lib/libipsec/ipsec_dump_policy.c
@@ -293,11 +293,7 @@ set_address(buf, len, sa)
 	size_t len;
 	struct sockaddr *sa;
 {
-#ifdef NI_WITHSCOPEID
-	const int niflags = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
 	const int niflags = NI_NUMERICHOST;
-#endif
 
 	if (len < 1)
 		return NULL;
diff --git a/lib/libipsec/pfkey_dump.c b/lib/libipsec/pfkey_dump.c
index 0113e141d32e..4d8eb4a29efa 100644
--- a/lib/libipsec/pfkey_dump.c
+++ b/lib/libipsec/pfkey_dump.c
@@ -497,11 +497,7 @@ str_ipaddr(sa)
 	struct sockaddr *sa;
 {
 	static char buf[NI_MAXHOST];
-#ifdef NI_WITHSCOPEID
-	const int niflag = NI_NUMERICHOST | NI_WITHSCOPEID;
-#else
 	const int niflag = NI_NUMERICHOST;
-#endif
 
 	if (sa == NULL)
 		return "";