Skip to content

Commit

Permalink
* sysdeps/posix/getaddrinfo.c (getaddrinfo): Only restrict search
Browse files Browse the repository at this point in the history
	to IPv4 or IPv6 if an interface has been found.
  • Loading branch information
Ulrich Drepper committed Nov 27, 2008
1 parent ca4dc0f commit be4607e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
4 changes: 2 additions & 2 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
2008-11-26 Ulrich Drepper <drepper@redhat.com>

* sysdeps/posix/getaddrinfo.c (getaddrinfo): If the system has
neither IPv4 nor IPv6 addresses defined, don't do anything.
* sysdeps/posix/getaddrinfo.c (getaddrinfo): Only restrict search
to IPv4 or IPv6 if an interface has been found.

2008-11-26 Roland McGrath <roland@redhat.com>

Expand Down
8 changes: 1 addition & 7 deletions sysdeps/posix/getaddrinfo.c
Original file line number Diff line number Diff line change
Expand Up @@ -2108,13 +2108,8 @@ 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))
{
if (! seen_ipv4 && ! seen_ipv6)
/* Neither IPv4 nor IPv6 interfaces exist, nothing to
return. */
goto err_noname;

local_hints = *hints;
local_hints.ai_family = seen_ipv4 ? PF_INET : PF_INET6;
hints = &local_hints;
Expand All @@ -2124,7 +2119,6 @@ getaddrinfo (const char *name, const char *service,
|| (hints->ai_family == PF_INET6 && ! seen_ipv6))
{
/* We cannot possibly return a valid answer. */
err_noname:
free (in6ai);
return EAI_NONAME;
}
Expand Down

0 comments on commit be4607e

Please sign in to comment.