diff options
| author | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-12-10 16:39:54 +0000 |
|---|---|---|
| committer | joseph <joseph@7b3dc134-2b1b-0410-93df-9e9f96275f8d> | 2008-12-10 16:39:54 +0000 |
| commit | 0f1e140e796f55cf5f07d39707f3e88d335f4ff1 (patch) | |
| tree | e44d49e4cb8da17389d4ffa57e784f7ee91d3381 /libc/sysdeps/posix | |
| parent | 8acd6170c246b159d26f05d85fa256746391d3d7 (diff) | |
| download | eglibc2-0f1e140e796f55cf5f07d39707f3e88d335f4ff1.tar.gz | |
Merge changes between r7357 and r7510 from /fsf/trunk.
git-svn-id: svn://svn.eglibc.org/trunk@7511 7b3dc134-2b1b-0410-93df-9e9f96275f8d
Diffstat (limited to 'libc/sysdeps/posix')
| -rw-r--r-- | libc/sysdeps/posix/getaddrinfo.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libc/sysdeps/posix/getaddrinfo.c b/libc/sysdeps/posix/getaddrinfo.c index 97f3af993..6ff0fc47a 100644 --- a/libc/sysdeps/posix/getaddrinfo.c +++ b/libc/sysdeps/posix/getaddrinfo.c @@ -733,6 +733,8 @@ gaih_inet (const char *name, const struct gaih_service *service, tmpbuflen, 2 * tmpbuflen); } + no_inet6_data = no_data; + if (status == NSS_STATUS_SUCCESS) { if ((req->ai_flags & AI_CANONNAME) != 0 && canon == NULL) @@ -2108,7 +2110,7 @@ getaddrinfo (const char *name, const char *service, { /* If we haven't seen both IPv4 and IPv6 interfaces we can narrow down the search. */ - if (! seen_ipv4 || ! seen_ipv6) + if ((! seen_ipv4 || ! seen_ipv6) && (seen_ipv4 || seen_ipv6)) { local_hints = *hints; local_hints.ai_family = seen_ipv4 ? PF_INET : PF_INET6; |