32c32
< "$FreeBSD: head/sbin/ifconfig/af_inet6.c 138593 2004-12-08 19:18:07Z sam $";
---
> "$FreeBSD: head/sbin/ifconfig/af_inet6.c 146187 2005-05-13 16:31:11Z ume $";
60,64d59
< /* wrapper for KAME-special getnameinfo() */
< #ifndef NI_WITHSCOPEID
< #define NI_WITHSCOPEID 0
< #endif
<
239,240c234
< sizeof(addr_buf), NULL, 0,
< NI_NUMERICHOST|NI_WITHSCOPEID);
---
> sizeof(addr_buf), NULL, 0, NI_NUMERICHOST);
270c264
< NI_NUMERICHOST|NI_WITHSCOPEID);
---
> NI_NUMERICHOST);
457,461d450
< #ifdef NI_WITHSCOPEID
< const int niflag = NI_NUMERICHOST | NI_WITHSCOPEID;
< #else
< const int niflag = NI_NUMERICHOST;
< #endif
472c461,462
< if (getnameinfo(sa, sa->sa_len, src, sizeof(src), 0, 0, niflag) != 0)
---
> if (getnameinfo(sa, sa->sa_len, src, sizeof(src), 0, 0,
> NI_NUMERICHOST) != 0)
479c469,470
< if (getnameinfo(sa, sa->sa_len, dst, sizeof(dst), 0, 0, niflag) != 0)
---
> if (getnameinfo(sa, sa->sa_len, dst, sizeof(dst), 0, 0,
> NI_NUMERICHOST) != 0)