]>
Commit | Line | Data |
---|---|---|
12788f63 MT |
1 | diff -rup a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c |
2 | --- a/sysdeps/posix/getaddrinfo.c 2012-03-20 21:31:14.177358937 -0600 | |
3 | +++ b/sysdeps/posix/getaddrinfo.c 2012-03-21 09:13:17.198290683 -0600 | |
4 | @@ -560,15 +563,11 @@ gaih_inet (const char *name, const struc | |
5 | int no_more; | |
6 | int old_res_options; | |
7 | ||
8 | - /* If we do not have to look for IPv4 and IPv6 together, use | |
9 | - the simple, old functions. */ | |
10 | - if ((req->ai_family == AF_INET | |
11 | - || (req->ai_family == AF_INET6 | |
12 | - && ((req->ai_flags & AI_V4MAPPED) == 0 | |
13 | - || (req->ai_flags & AI_ALL) == 0))) | |
14 | - && (req->ai_flags & AI_CANONNAME) == 0) | |
15 | + /* If we do not have to look for IPv6 addresses, use | |
16 | + the simple, old functions, which do not support | |
17 | + IPv6 scope ids. */ | |
18 | + if (req->ai_family == AF_INET) | |
19 | { | |
20 | - int family = req->ai_family; | |
21 | size_t tmpbuflen = 512; | |
22 | assert (tmpbuf == NULL); | |
23 | tmpbuf = alloca_account (tmpbuflen, alloca_used); |