diff options
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | sysdeps/posix/getaddrinfo.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 88c2b5dc7d..7131a286f0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2016-05-10 Florian Weimer <fweimer@redhat.com> + + [BZ #19994] + * sysdeps/posix/getaddrinfo.c (gethosts): Restore RES_USE_INET6 + flag in _res.options. + 2016-05-09 Joseph Myers <joseph@codesourcery.com> * conform/data/sys/types.h-data (blkcnt_t): Do not expect for diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c index fed2d3bf13..c670a984b2 100644 --- a/sysdeps/posix/getaddrinfo.c +++ b/sysdeps/posix/getaddrinfo.c @@ -240,6 +240,7 @@ convert_hostent_to_gaih_addrtuple (const struct addrinfo *req, 2 * tmpbuflen); \ if (newp == NULL) \ { \ + _res.options |= old_res_options & RES_USE_INET6; \ result = -EAI_MEMORY; \ goto free_and_return; \ } \ |