SHA256
6
0
forked from pool/glibc

Accepting request 73854 from home:a_jaeger:branches:openSUSE:Factory

Split up glibc-devel-static, fix bugs.

OBS-URL: https://build.opensuse.org/request/show/73854
OBS-URL: https://build.opensuse.org/package/show/Base:System/glibc?expand=0&rev=61
This commit is contained in:
2011-06-16 13:36:45 +00:00
committed by Git OBS Bridge
parent 361ad21737
commit 484481503e
3 changed files with 90 additions and 17 deletions

View File

@@ -13,7 +13,16 @@ Index: sysdeps/posix/getaddrinfo.c
{
const struct gaih_typeproto *tp = gaih_inet_typeproto;
struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv;
@@ -766,7 +766,7 @@ gaih_inet (const char *name, const struc
@@ -706,7 +706,7 @@ gaih_inet (const char *name, const struc
no_data = 0;
nss_gethostbyname4_r fct4
= __nss_lookup_function (nip, "gethostbyname4_r");
- if (fct4 != NULL)
+ if (fct4 != NULL && usable_ipv6)
{
int herrno;
@@ -763,7 +763,7 @@ gaih_inet (const char *name, const struc
if (fct != NULL)
{
if (req->ai_family == AF_INET6
@@ -22,7 +31,7 @@ Index: sysdeps/posix/getaddrinfo.c
{
gethosts (AF_INET6, struct in6_addr);
no_inet6_data = no_data;
@@ -2157,7 +2157,7 @@ getaddrinfo (const char *name, const cha
@@ -2156,7 +2156,7 @@ getaddrinfo (const char *name, const cha
if (hints->ai_family == AF_UNSPEC || hints->ai_family == AF_INET
|| hints->ai_family == AF_INET6)
{