From 997c2a72c1238144e2377c92f2da207cb188f7aa Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 19 Jan 2011 15:50:05 -0500 Subject: Fix decoding of canonical name in getaddrinfo. (cherry picked from commit 86e9235918a715095a1f5bb1c1db28fae7fca22b) --- ChangeLog | 5 +++++ sysdeps/posix/getaddrinfo.c | 1 + 2 files changed, 6 insertions(+) diff --git a/ChangeLog b/ChangeLog index 5a64ac8df5..b4dcd7f0e4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-10-01 Andreas Schwab + + * sysdeps/posix/getaddrinfo.c (gaih_inet): Don't discard result of + decoding ACE if AI_CANONIDN. + 2011-01-17 Ulrich Drepper * io/fcntl.h: Define AT_NO_AUTOMOUNT. diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index 8b7e38fdea..0217cc6fd3 100644 --- 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 -- cgit 1.4.1