about summary refs log tree commit diff
path: root/sysdeps/posix/getaddrinfo.c
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@redhat.com>2011-06-30 06:33:32 -0400
committerUlrich Drepper <drepper@gmail.com>2011-06-30 06:33:32 -0400
commit89f654c57b3b9a6aee480e25e37f88f06c898901 (patch)
tree855165a567501d6cbe3a92fb8d9f88552b2d3b6c /sysdeps/posix/getaddrinfo.c
parent2c0e54ff32dedae504a34d1f551b4a1f69c3130a (diff)
downloadglibc-89f654c57b3b9a6aee480e25e37f88f06c898901.tar.gz
glibc-89f654c57b3b9a6aee480e25e37f88f06c898901.tar.xz
glibc-89f654c57b3b9a6aee480e25e37f88f06c898901.zip
Make sure RES_USE_INET6 is always restored
Diffstat (limited to 'sysdeps/posix/getaddrinfo.c')
-rw-r--r--sysdeps/posix/getaddrinfo.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/sysdeps/posix/getaddrinfo.c b/sysdeps/posix/getaddrinfo.c
index 05c883d850..6d574c51e8 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;
 					}