This is the mail archive of the
glibc-cvs@sourceware.org
mailing list for the glibc project.
GNU C Library master sources branch master updated. glibc-2.23-302-g8db2cf1
- From: fw at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 10 May 2016 08:23:04 -0000
- Subject: GNU C Library master sources branch master updated. glibc-2.23-302-g8db2cf1
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".
The branch, master has been updated
via 8db2cf163e048b02cbafe118bf033b78618c2f30 (commit)
from 9e6e128d145157844cf446962a640eacafc54a01 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=8db2cf163e048b02cbafe118bf033b78618c2f30
commit 8db2cf163e048b02cbafe118bf033b78618c2f30
Author: Florian Weimer <fweimer@redhat.com>
Date: Tue May 10 10:09:24 2016 +0200
getaddrinfo: Restore RES_USE_INET6 flag on error path [BZ #19994]
diff --git a/ChangeLog b/ChangeLog
index 88c2b5d..7131a28 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 fed2d3b..c670a98 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; \
} \
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 6 ++++++
sysdeps/posix/getaddrinfo.c | 1 +
2 files changed, 7 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources