From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 27 Nov 2008 06:31:04 +0000 (+0000)
Subject: * sysdeps/posix/getaddrinfo.c (getaddrinfo): Only restrict search
X-Git-Tag: cvs/fedora-glibc-20090102T0809~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be4607eba89e85e3fd825e97e203f02cc3f31688;p=thirdparty%2Fglibc.git

* sysdeps/posix/getaddrinfo.c (getaddrinfo): Only restrict search

	to IPv4 or IPv6 if an interface has been found.
---

diff --git a/ChangeLog b/ChangeLog
index 3b0ac9351e4..4a6fc004d26 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index b52c371c81e..72fbdb0f012 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -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;
@@ -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;
 	}