484481503e
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
43 lines
1.5 KiB
Diff
43 lines
1.5 KiB
Diff
References: bnc#361697
|
|
|
|
Index: sysdeps/posix/getaddrinfo.c
|
|
===================================================================
|
|
--- sysdeps/posix/getaddrinfo.c.orig
|
|
+++ sysdeps/posix/getaddrinfo.c
|
|
@@ -269,7 +269,7 @@ extern service_user *__nss_hosts_databas
|
|
static int
|
|
gaih_inet (const char *name, const struct gaih_service *service,
|
|
const struct addrinfo *req, struct addrinfo **pai,
|
|
- unsigned int *naddrs)
|
|
+ unsigned int *naddrs, bool usable_ipv6)
|
|
{
|
|
const struct gaih_typeproto *tp = gaih_inet_typeproto;
|
|
struct gaih_servtuple *st = (struct gaih_servtuple *) &nullserv;
|
|
@@ -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
|
|
- || req->ai_family == AF_UNSPEC)
|
|
+ || (req->ai_family == AF_UNSPEC && usable_ipv6))
|
|
{
|
|
gethosts (AF_INET6, struct in6_addr);
|
|
no_inet6_data = no_data;
|
|
@@ -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)
|
|
{
|
|
- last_i = gaih_inet (name, pservice, hints, end, &naddrs);
|
|
+ last_i = gaih_inet (name, pservice, hints, end, &naddrs, seen_ipv6);
|
|
if (last_i != 0)
|
|
{
|
|
freeaddrinfo (p);
|