diff options
| author | Robert Mustacchi <rm@joyent.com> | 2014-08-14 21:58:20 +0000 |
|---|---|---|
| committer | Robert Mustacchi <rm@joyent.com> | 2014-12-10 15:36:39 -0800 |
| commit | 2f443e27e5988131d8b57bec58ee15f9227e0899 (patch) | |
| tree | 29561bb2247a33c57961097813dd556cccee6f21 /usr/src/lib/libnsl/nss/getipnodeby.c | |
| parent | e3bee06925aba994e30db6f2d408f86963166961 (diff) | |
| download | illumos-joyent-2f443e27e5988131d8b57bec58ee15f9227e0899.tar.gz | |
5096 getaddrinfo doesn't properly handle AI_ADDRCONFIG | AI_V4MAPPED
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Jason King <jason.brian.king@gmail.com>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/lib/libnsl/nss/getipnodeby.c')
| -rw-r--r-- | usr/src/lib/libnsl/nss/getipnodeby.c | 26 |
1 files changed, 25 insertions, 1 deletions
diff --git a/usr/src/lib/libnsl/nss/getipnodeby.c b/usr/src/lib/libnsl/nss/getipnodeby.c index 112b54ec5a..f84b641157 100644 --- a/usr/src/lib/libnsl/nss/getipnodeby.c +++ b/usr/src/lib/libnsl/nss/getipnodeby.c @@ -73,6 +73,8 @@ * IPNODE_LOOKUPIPNODES getipnodebyname() needs to lookup the name in ipnodes. * IPNODE_LOOKUPHOSTS getipnodebyname() needs to lookup the name in hosts. * IPNODE_ISLITERAL The name supplied is a literal address string. + * IPNODE_UNMAP The user doesn't want v4 mapped addresses if no IPv6 + * interfaces are plumbed on the system. */ #define IPNODE_WANTIPV6 0x00000001u #define IPNODE_WANTIPV4 0x00000002u @@ -80,9 +82,16 @@ #define IPNODE_LOOKUPIPNODES 0x00000008u #define IPNODE_LOOKUPHOSTS 0x00000010u #define IPNODE_LITERAL 0x00000020u +#define IPNODE_UNMAP 0x00000040u #define IPNODE_IPV4 (IPNODE_WANTIPV4 | IPNODE_IPV4IFNOIPV6) /* + * The private flag between libsocket and libnsl. See + * lib/libsocket/inet/getaddrinfo.c for more information. + */ +#define AI_ADDRINFO 0x8000 + +/* * The default set of bits corresponding to a getipnodebyname() flags * argument of AI_DEFAULT. */ @@ -162,6 +171,10 @@ getipnodebyname_processflags(const char *name, int af, int flags) } else if (flags & AI_ALL) { ipnode_bits &= ~IPNODE_IPV4IFNOIPV6; } + if ((flags & AI_ADDRCONFIG) && !ipv6configured && + (flags & AI_ADDRINFO)) { + ipnode_bits |= IPNODE_UNMAP; + } } else { ipnode_bits &= ~IPNODE_IPV4; } @@ -343,7 +356,18 @@ getipnodebyname(const char *name, int af, int flags, int *error_num) else if (!(ipnode_bits & IPNODE_WANTIPV6)) hp = __filter_addresses(AF_INET6, buf6->result); - if (hp == NULL) + /* + * We've been asked to unmap v4 addresses. This + * situation implies IPNODE_WANTIPV4 and + * !IPNODE_WANTIPV6. + */ + if (hp != NULL && (ipnode_bits & IPNODE_UNMAP)) { + /* + * Just set hp to a new value, cleanup: will + * free the old one + */ + hp = __mappedtov4(hp, error_num); + } else if (hp == NULL) *error_num = NO_ADDRESS; } |