summaryrefslogtreecommitdiffstats
path: root/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:11 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-09-01 19:09:57 +0100
commitd62ee7eaf2ba025c3f64b2d4e10dc7cec4637612 (patch)
treef36fe3008f36ff75cbdd31b630f8f13f1f205ebb /meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
parentcaab7fc509bf27706ff3248689f6afd04225cfda (diff)
downloadpoky-d62ee7eaf2ba025c3f64b2d4e10dc7cec4637612.tar.gz
packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch')
-rw-r--r--meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch45
1 files changed, 45 insertions, 0 deletions
diff --git a/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
new file mode 100644
index 0000000000..88a2b5e43b
--- /dev/null
+++ b/meta/recipes-extended/tcp-wrappers/tcp-wrappers-7.6/11_usagi_fix.patch
@@ -0,0 +1,45 @@
1diff -uN tcp_wrappers_7.6/hosts_access.c tcp_wrappers_7.6.new/hosts_access.c
2--- tcp_wrappers_7.6/hosts_access.c Mon May 20 14:00:56 2002
3+++ tcp_wrappers_7.6.new/hosts_access.c Mon May 20 14:25:05 2002
4@@ -448,6 +448,15 @@
5 int len, mask_len, i = 0;
6 char ch;
7
8+ /*
9+ * Behavior of getaddrinfo() against IPv4-mapped IPv6 address is
10+ * different between KAME and Solaris8. While KAME returns
11+ * AF_INET6, Solaris8 returns AF_INET. So, we avoid this here.
12+ */
13+ if (STRN_EQ(string, "::ffff:", 7)
14+ && dot_quad_addr(string + 7) != INADDR_NONE)
15+ return (masked_match4(net_tok, mask_tok, string + 7));
16+
17 memset(&hints, 0, sizeof(hints));
18 hints.ai_family = AF_INET6;
19 hints.ai_socktype = SOCK_STREAM;
20@@ -457,13 +466,6 @@
21 memcpy(&addr, res->ai_addr, sizeof(addr));
22 freeaddrinfo(res);
23
24- if (IN6_IS_ADDR_V4MAPPED(&addr.sin6_addr)) {
25- if ((*(u_int32_t *)&net.sin6_addr.s6_addr[12] = dot_quad_addr(net_tok)) == INADDR_NONE
26- || (mask = dot_quad_addr(mask_tok)) == INADDR_NONE)
27- return (NO);
28- return ((*(u_int32_t *)&addr.sin6_addr.s6_addr[12] & mask) == *(u_int32_t *)&net.sin6_addr.s6_addr[12]);
29- }
30-
31 /* match IPv6 address against netnumber/prefixlen */
32 len = strlen(net_tok);
33 if (*net_tok != '[' || net_tok[len - 1] != ']')
34diff -uN tcp_wrappers_7.6/socket.c tcp_wrappers_7.6.new/socket.c
35--- tcp_wrappers_7.6/socket.c Mon May 20 13:48:35 2002
36+++ tcp_wrappers_7.6.new/socket.c Mon May 20 14:22:27 2002
37@@ -228,7 +228,7 @@
38 hints.ai_family = sin->sa_family;
39 hints.ai_socktype = SOCK_STREAM;
40 hints.ai_flags = AI_PASSIVE | AI_CANONNAME | AI_NUMERICHOST;
41- if ((err = getaddrinfo(host->name, NULL, &hints, &res0) == 0)) {
42+ if ((err = getaddrinfo(host->name, NULL, &hints, &res0)) == 0) {
43 freeaddrinfo(res0);
44 res0 = NULL;
45 tcpd_warn("host name/name mismatch: "