Fix decoding of canonical name in getaddrinfo.

diff --git a/ChangeLog b/ChangeLog
index 40b02db667ae835daf49dd09d0564f93abf38625..d3ae8bc94a722397be71aa17d803a02ad0ae67f9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-10-01  Andreas Schwab  <schwab@redhat.com>
+
+       * sysdeps/posix/getaddrinfo.c (gaih_inet): Don't discard result of
+       decoding ACE if AI_CANONIDN.
+
 2011-01-18  Ulrich Drepper  <drepper@gmail.com>
 
        * elf/Makefile: Build IFUNC tests unless multi-arch = no.

diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 126a09ea339a15387e2e17d2222f72187c542558..c61c72a24ac2c27a82f9daf569c6d17f99618076 100644 (file)
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -965,6 +965,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
                   make a copy.  */
                if (out == canon)
                  goto make_copy;
+               canon = out;
              }
            else
 #endif