5b108142b5
- Update to glibc 2.18 release * No source change - strcoll-overflow.patch: fix buffer overflow in strcoll (CVE-2012-4412, bnc#779320) - readdir_r-overflow.patch: fix readdir_r with long file names (CVE-2013-4237, bnc#834594) (forwarded request 186872 from Andreas_Schwab) OBS-URL: https://build.opensuse.org/request/show/186878 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glibc?expand=0&rev=153
48 lines
1.8 KiB
Diff
48 lines
1.8 KiB
Diff
Index: glibc-2.17.90/sysdeps/posix/getaddrinfo.c
|
|
===================================================================
|
|
--- glibc-2.17.90.orig/sysdeps/posix/getaddrinfo.c
|
|
+++ glibc-2.17.90/sysdeps/posix/getaddrinfo.c
|
|
@@ -270,7 +270,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;
|
|
@@ -840,7 +840,10 @@ gaih_inet (const char *name, const struc
|
|
if (req->ai_family == PF_UNSPEC)
|
|
fct4 = __nss_lookup_function (nip, "gethostbyname4_r");
|
|
|
|
- if (fct4 != NULL)
|
|
+ /* If we don't want ipv6, don't use gethostbyname4_r,
|
|
+ as it's using T_UNSPEC to libc_res_nsearch, which always
|
|
+ create T_A and T_AAAA queries. */
|
|
+ if (usable_ipv6 && fct4 != NULL)
|
|
{
|
|
int herrno;
|
|
|
|
@@ -943,7 +946,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;
|
|
@@ -2471,7 +2474,11 @@ 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);
|
|
+ if (!check_pf_called)
|
|
+ __check_pf (&seen_ipv4, &seen_ipv6, &in6ai, &in6ailen);
|
|
+ check_pf_called = true;
|
|
+
|
|
+ last_i = gaih_inet (name, pservice, hints, end, &naddrs, seen_ipv6);
|
|
if (last_i != 0)
|
|
{
|
|
freeaddrinfo (p);
|