Fix decoding of canonical name in getaddrinfo.

(cherry picked from commit 86e9235918a715095a1f5bb1c1db28fae7fca22b)

diff --git a/ChangeLog b/ChangeLog
index 5a64ac8df5ed364bb66558165bc424e75a1922f4..b4dcd7f0e4d0d9be4bc208c472b29947a058bd83 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-17  Ulrich Drepper  <drepper@gmail.com>
 
        * io/fcntl.h: Define AT_NO_AUTOMOUNT.

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