From 44758a88d0f1683591349dd604f3f86212cfd25b Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Sat, 2 Jul 2011 19:15:07 +0000 Subject: [PATCH] - RES_USE_INET6 upstream fix Changed files: glibc-git.patch -> 1.8 --- glibc-git.patch | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/glibc-git.patch b/glibc-git.patch index b2661ab..330109d 100644 --- a/glibc-git.patch +++ b/glibc-git.patch @@ -539,3 +539,38 @@ index 3190a13..6c8d83a 100644 if (dataset != NULL && !alloca_used) { +commit 89f654c57b3b9a6aee480e25e37f88f06c898901 +Author: Andreas Schwab +Date: Thu Jun 30 06:33:32 2011 -0400 + + Make sure RES_USE_INET6 is always restored + +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; + } -- 2.44.0