Filter results from gethostbyname4_r according to request flags

diff --git a/ChangeLog b/ChangeLog
index 249b858033907ca5fb3428b341edf00a9cc6c6f3..3a9329b30a65bb54e085a8a1b3ea42093f3fc528 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-06-16  Andreas Schwab  <schwab@redhat.com>
+
+       [BZ #12885]
+       * sysdeps/posix/getaddrinfo.c (gaih_inet): Filter results from
+       gethostbyname4_r according to request flags.
+
 2011-06-15  Ulrich Drepper  <drepper@gmail.com>
 
        * resolv/res_send.c (__libc_res_nsend): Fix typos in last patch.  We

diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index a59d9c6aee798afb67a06f485e67a004d0818808..3c5e52f6638273a059830d103b751859685bd342 100644 (file)
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -881,16 +881,48 @@ gaih_inet (const char *name, const struct gaih_service *service,
                        }
                    }
 
-                 no_inet6_data = no_data;
-
                  if (status == NSS_STATUS_SUCCESS)
                    {
                      if ((req->ai_flags & AI_CANONNAME) != 0 && canon == NULL)
                        canon = (*pat)->name;
 
                      while (*pat != NULL)
-                       pat = &((*pat)->next);
+                       {
+                         if ((*pat)->family == AF_INET
+                             && req->ai_family == AF_INET6
+                             && (req->ai_flags & AI_V4MAPPED) != 0)
+                           {
+                             uint32_t *pataddr = (*pat)->addr;
+                             (*pat)->family = AF_INET6;
+                             pataddr[3] = pataddr[0];
+                             pataddr[2] = htonl (0xffff);
+                             pataddr[1] = 0;
+                             pataddr[0] = 0;
+                             pat = &(*pat)->next;
+                           }
+                         else if ((req->ai_family == AF_UNSPEC
+                                   || (*pat)->family == req->ai_family))
+                           {
+                             if ((*pat)->family == AF_INET6)
+                               got_ipv6 = true;
+                             pat = &(*pat)->next;
+                           }
+                         else if (*pat == at)
+                           {
+                             if ((*pat)->next != NULL)
+                               memcpy (*pat, (*pat)->next, sizeof (**pat));
+                             else
+                               {
+                                 no_data = 1;
+                                 break;
+                               }
+                           }
+                         else
+                           *pat = (*pat)->next;
+                       }
                    }
+
+                 no_inet6_data = no_data;
                }
              else
                {