diff options
| author | Ulrich Drepper <drepper@gmail.com> | 2011-01-19 15:50:05 -0500 |
|---|---|---|
| committer | Petr Baudis <pasky@suse.cz> | 2011-02-03 23:16:59 +0100 |
| commit | 997c2a72c1238144e2377c92f2da207cb188f7aa (patch) | |
| tree | 35f569b25015f855fe79f03340193791a8d5eb62 | |
| parent | 77314ef9bd82f3256e8b29428b2d9062f2523567 (diff) | |
| download | glibc-997c2a72c1238144e2377c92f2da207cb188f7aa.tar.gz glibc-997c2a72c1238144e2377c92f2da207cb188f7aa.tar.xz glibc-997c2a72c1238144e2377c92f2da207cb188f7aa.zip | |
Fix decoding of canonical name in getaddrinfo.
(cherry picked from commit 86e9235918a715095a1f5bb1c1db28fae7fca22b)
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | sysdeps/posix/getaddrinfo.c | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 5a64ac8df5..b4dcd7f0e4 100644 --- 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 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 |