Make sure RES_USE_INET6 is always restored

diff --git a/ChangeLog b/ChangeLog
index 48c7586c57311b0af72b97078cc201cd65ce7a5f..db26998814a2fee84a8fccf44cc1ed41c73aa7c9 100644 (file)
--- 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 05c883d850f93e24127b56b80a32d01b74c857d4..6d574c51e8b1f5f8da81220feb1085b43d8d7cc8 100644 (file)
--- 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;
                                        }