qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure RES_USE_INET6 is always restored

This commit is contained in:
Andreas Schwab 2011-06-30 06:33:32 -04:00 committed by Ulrich Drepper
parent 2c0e54ff32
commit 89f654c57b
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 2011-06-29 Ulrich Drepper <drepper@gmail.com>
* nscd/grpcache.c (cache_addgr): Don't write notfound reply if we * nscd/grpcache.c (cache_addgr): Don't write notfound reply if we

4
sysdeps/posix/getaddrinfo.c
View File

@ -818,6 +818,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
tmpbuf = malloc (tmpbuflen); tmpbuf = malloc (tmpbuflen);
if (tmpbuf == NULL) if (tmpbuf == NULL)
{ {
_res.options |= old_res_options & RES_USE_INET6;
result = -EAI_MEMORY; result = -EAI_MEMORY;
goto free_and_return; goto free_and_return;
} }
@ -862,6 +863,7 @@ gaih_inet (const char *name, const struct gaih_service *service,
2 * tmpbuflen); 2 * tmpbuflen);
if (newp == NULL) if (newp == NULL)
{ {
_res.options |= old_res_options & RES_USE_INET6;
result = -EAI_MEMORY; result = -EAI_MEMORY;
goto free_and_return; goto free_and_return;
} }
@ -981,6 +983,8 @@ gaih_inet (const char *name, const struct gaih_service *service,
canonbuf = malloc (max_fqdn_len); canonbuf = malloc (max_fqdn_len);
if (canonbuf == NULL) if (canonbuf == NULL)
{ {
_res.options
|= old_res_options & RES_USE_INET6;
result = -EAI_MEMORY; result = -EAI_MEMORY;
goto free_and_return; goto free_and_return;
} }