summaryrefslogtreecommitdiff
path: root/net/bind95/patches/patch-ac
blob: c518e37bce1d29bbf66ac66e16788dc35dd03ad0 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
$NetBSD: patch-ac,v 1.3 2009/11/30 11:58:30 tron Exp $

--- lib/lwres/getaddrinfo.c.orig	2008-11-25 23:46:36.000000000 +0000
+++ lib/lwres/getaddrinfo.c	2009-11-30 10:48:37.000000000 +0000
@@ -142,6 +142,10 @@
 #include <lwres/netdb.h>
 #include <lwres/stdlib.h>
 
+#ifdef __KAME__
+#include <net/if.h>
+#endif
+
 #define SA(addr)	((struct sockaddr *)(addr))
 #define SIN(addr)	((struct sockaddr_in *)(addr))
 #define SIN6(addr)	((struct sockaddr_in6 *)(addr))
@@ -366,14 +370,22 @@
 			p = strchr(ntmp, '%');
 			ep = NULL;
 
+#ifdef __KAME__
+			if (p != NULL) {
+				scopeid = if_nametoindex(p + 1);
+				if (scopeid)
+					p = NULL;
+			}
+#endif
 			/*
 			 * Vendors may want to support non-numeric
 			 * scopeid around here.
 			 */
 
-			if (p != NULL)
+			if (p != NULL) {
 				scopeid = (lwres_uint32_t)strtoul(p + 1,
 								  &ep, 10);
+			}
 			if (p != NULL && ep != NULL && ep[0] == '\0')
 				*p = '\0';
 			else {