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.14-59-g89f654c
- From: drepper at sourceware dot org
- To: glibc-cvs at sourceware dot org
- Date: 30 Jun 2011 10:33:47 -0000
- Subject: GNU C Library master sources branch, master, updated. glibc-2.14-59-g89f654c
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 89f654c57b3b9a6aee480e25e37f88f06c898901 (commit)
from 2c0e54ff32dedae504a34d1f551b4a1f69c3130a (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://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=89f654c57b3b9a6aee480e25e37f88f06c898901
commit 89f654c57b3b9a6aee480e25e37f88f06c898901
Author: Andreas Schwab <schwab@redhat.com>
Date: Thu Jun 30 06:33:32 2011 -0400
Make sure RES_USE_INET6 is always restored
diff --git a/ChangeLog b/ChangeLog
index 48c7586..db26998 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-30 Andreas Schwab <schwab@redhat.com>
+
+ * sysdeps/posix/getaddrinfo.c (gaih_inet): Make sure RES_USE_INET6
+ is always restored.
+
2011-06-29 Ulrich Drepper <drepper@gmail.com>
* nscd/grpcache.c (cache_addgr): Don't write notfound reply if we
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 05c883d..6d574c5 100644
--- a/sysdeps/posix/getaddrinfo.c
+++ b/sysdeps/posix/getaddrinfo.c
@@ -818,6 +818,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
tmpbuf = malloc (tmpbuflen);
if (tmpbuf == NULL)
{
+ _res.options |= old_res_options & RES_USE_INET6;
result = -EAI_MEMORY;
goto free_and_return;
}
@@ -862,6 +863,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
2 * tmpbuflen);
if (newp == NULL)
{
+ _res.options |= old_res_options & RES_USE_INET6;
result = -EAI_MEMORY;
goto free_and_return;
}
@@ -981,6 +983,8 @@ gaih_inet (const char *name, const struct gaih_service *service,
canonbuf = malloc (max_fqdn_len);
if (canonbuf == NULL)
{
+ _res.options
+ |= old_res_options & RES_USE_INET6;
result = -EAI_MEMORY;
goto free_and_return;
}
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 5 +++++
sysdeps/posix/getaddrinfo.c | 4 ++++
2 files changed, 9 insertions(+), 0 deletions(-)
hooks/post-receive
--
GNU C Library master sources