diff options
| author | ume <ume@FreeBSD.org> | 2013-01-10 14:08:19 +0000 |
|---|---|---|
| committer | ume <ume@FreeBSD.org> | 2013-01-10 14:08:19 +0000 |
| commit | 48d4ca6f43e841b9dc56825f68e423088aaa4dfe (patch) | |
| tree | e461d9debcf3fe7313caf083467d0a668c84f1a6 /lib | |
| parent | d2863e4c68a3742c3168311bfe110d8fa15d4de1 (diff) | |
| download | FreeBSD-src-48d4ca6f43e841b9dc56825f68e423088aaa4dfe.zip FreeBSD-src-48d4ca6f43e841b9dc56825f68e423088aaa4dfe.tar.gz | |
Re-enable ip6addrctl support but only for IPv6 address.
Requested by: Ben Morrow <ben__at__morrow.me.uk>
MFC after: 1 week
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/libc/net/name6.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/lib/libc/net/name6.c b/lib/libc/net/name6.c index 4d7cf79..f360162 100644 --- a/lib/libc/net/name6.c +++ b/lib/libc/net/name6.c @@ -200,7 +200,7 @@ static struct hostent *_hpmapv6(struct hostent *, int *); #endif static struct hostent *_hpsort(struct hostent *, res_state); -#ifdef ENABLE_IP6ADDRCTL +#ifdef INET6 static struct hostent *_hpreorder(struct hostent *); static int get_addrselectpolicy(struct policyhead *); static void free_addrselectpolicy(struct policyhead *); @@ -287,8 +287,10 @@ getipnodebyname(const char *name, int af, int flags, int *errp) hp = gethostbyname2(name, af); hp = _hpcopy(hp, errp); - #ifdef INET6 + if (af == AF_INET6) + hp = _hpreorder(hp); + if (af == AF_INET6 && ((flags & AI_ALL) || hp == NULL) && MAPADDRENABLED(flags)) { struct hostent *hp2 = gethostbyname2(name, AF_INET); @@ -311,11 +313,7 @@ getipnodebyname(const char *name, int af, int flags, int *errp) *errp = statp->res_h_errno; statp->options = options; -#ifdef ENABLE_IP6ADDRCTL - return _hpreorder(_hpsort(hp, statp)); -#else return _hpsort(hp, statp); -#endif } struct hostent * @@ -638,7 +636,7 @@ _hpsort(struct hostent *hp, res_state statp) return hp; } -#ifdef ENABLE_IP6ADDRCTL +#ifdef INET6 /* * _hpreorder: sort address by default address selection */ |
