From: Andreas Schwab <schwab@redhat.com>
Date: Wed, 22 Jun 2011 18:35:49 +0000 (-0400)
Subject: Fix Ipv4&IPv6 lookup in getaddrinfo
X-Git-Tag: glibc-2.14.1~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ec98a06e70c071cc38c45c80804df4afc7eff09;p=thirdparty%2Fglibc.git

Fix Ipv4&IPv6 lookup in getaddrinfo

Problem introduced in the last patch.
(cherry picked from commit e12df166d37522c2ed434c2d70a1b04640d2d7c6)
---

diff --git a/ChangeLog b/ChangeLog
index 47a9fbbb573..c90463ec741 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-22  Andreas Schwab  <schwab@redhat.com>
+
+	* sysdeps/posix/getaddrinfo.c (gaih_inet): Fix last change.
+
 2011-06-21  Ulrich Drepper  <drepper@gmail.com>
 
 	[BZ #12885]
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index abd8551074c..6b7423cda14 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -904,7 +904,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
 			      pat = &((*pat)->next);
 			      no_data = 0;
 			    }
-			  else if ((*pat)->family == AF_UNSPEC
+			  else if (req->ai_family == AF_UNSPEC
 				   || (*pat)->family == req->ai_family)
 			    {
 			      pat = &((*pat)->next);