metalefty/glibc
1
0
Fork 0
forked from rpms/glibc
Code Pull Requests Activity

2.14-3

Browse Source
This commit is contained in:
Andreas Schwab 2011-06-21 17:12:12 +02:00
parent cecb16f60f
commit 382444fc14
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
glibc-fedora.patch
View File

@ -4108,7 +4108,15 @@
weak_alias (__getrlimit, getrlimit) weak_alias (__getrlimit, getrlimit)
--- glibc-2.14-12-g5babac1/sysdeps/posix/getaddrinfo.c --- glibc-2.14-12-g5babac1/sysdeps/posix/getaddrinfo.c
+++ glibc-2.14-3/sysdeps/posix/getaddrinfo.c +++ glibc-2.14-3/sysdeps/posix/getaddrinfo.c
@@ -889,7 +889,29 @@ gaih_inet (const char *name, const struct gaih_service *service, @@ -881,16 +881,48 @@ gaih_inet (const char *name, const struct gaih_service *service,
}
}
- no_inet6_data = no_data;
-
if (status == NSS_STATUS_SUCCESS)
{
if ((req->ai_flags & AI_CANONNAME) != 0 && canon == NULL)
canon = (*pat)->name; canon = (*pat)->name;
while (*pat != NULL) while (*pat != NULL)
@ -4133,13 +4141,26 @@
+ got_ipv6 = true; + got_ipv6 = true;
+ pat = &(*pat)->next; + pat = &(*pat)->next;
+ } + }
+ else if (*pat == at)
+ {
+ if ((*pat)->next != NULL)
+ memcpy (*pat, (*pat)->next, sizeof (**pat));
+ else
+ {
+ no_data = 1;
+ break;
+ }
+ }
+ else + else
+ *pat = (*pat)->next; + *pat = (*pat)->next;
+ } + }
} }
+
+ no_inet6_data = no_data;
} }
else else
@@ -1335,10 +1357,12 @@ static const struct scopeentry {
@@ -1335,10 +1367,12 @@ static const struct scopeentry
/* Link-local addresses: scope 2. */ /* Link-local addresses: scope 2. */
{ { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 }, { { { 169, 254, 0, 0 } }, htonl_c (0xffff0000), 2 },
{ { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 }, { { { 127, 0, 0, 0 } }, htonl_c (0xff000000), 2 },

2
sources
View File

@ -1,3 +1,3 @@
c430a5a8a9f762b94e5c1c3b202fe0c1 glibc-2.14-12-g5babac1-fedora.tar.xz 4f1cbb5c58b8ca754714c65763d54068 glibc-2.14-12-g5babac1-fedora.tar.xz
96a48cb0acb030c77e224c7748684652 glibc-2.14-12-g5babac1.tar.xz 96a48cb0acb030c77e224c7748684652 glibc-2.14-12-g5babac1.tar.xz
05c85905b43021a81318c3aa81718019 glibc-ports-2.14.tar.xz 05c85905b43021a81318c3aa81718019 glibc-ports-2.14.tar.xz