From f25346647715493398b1cb4c608f37bac86ef3fa Mon Sep 17 00:00:00 2001
From: itojun <itojun@pkgsrc.org>
Date: Sun, 28 Jan 2001 07:15:29 +0000
Subject: test NI_NUMERICSCOPE on getnameinfo scope support

---
 net/bind9/files/patch-sum  |  4 ++--
 net/bind9/patches/patch-ab | 19 +++++++++----------
 2 files changed, 11 insertions(+), 12 deletions(-)

(limited to 'net/bind9')

diff --git a/net/bind9/files/patch-sum b/net/bind9/files/patch-sum
index 2866c9a3009..5319c9db5ed 100644
--- a/net/bind9/files/patch-sum
+++ b/net/bind9/files/patch-sum
@@ -1,5 +1,5 @@
-$NetBSD: patch-sum,v 1.9 2001/01/28 06:50:22 itojun Exp $
+$NetBSD: patch-sum,v 1.10 2001/01/28 07:15:29 itojun Exp $
 
 MD5 (patch-aa) = 3be805415711351895d5a56902402991
-MD5 (patch-ab) = c89b529b57569fe7d576363b16d47831
+MD5 (patch-ab) = 3e621698a3fcf50cf5d14c6f3044d948
 MD5 (patch-ac) = 39674a6def784d6011004d80fb36e271
diff --git a/net/bind9/patches/patch-ab b/net/bind9/patches/patch-ab
index 95a6d025281..eb1efaeae50 100644
--- a/net/bind9/patches/patch-ab
+++ b/net/bind9/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2001/01/28 06:50:22 itojun Exp $
+$NetBSD: patch-ab,v 1.6 2001/01/28 07:15:29 itojun Exp $
 support for kame scopeid extension (assumes that link scope = interface)
 
 --- lib/lwres/getnameinfo.c-	Sun Jan 28 15:34:19 2001
-+++ lib/lwres/getnameinfo.c	Sun Jan 28 15:36:33 2001
++++ lib/lwres/getnameinfo.c	Sun Jan 28 16:13:15 2001
 @@ -63,6 +63,9 @@
  #include <sys/socket.h>
  
@@ -13,22 +13,21 @@ support for kame scopeid extension (assumes that link scope = interface)
  
  #include <stdio.h>
  #include <string.h>
-@@ -219,14 +222,10 @@
+@@ -219,13 +222,11 @@
  		    ((const struct sockaddr_in6 *)sa)->sin6_scope_id) {
  			char *p = numaddr + strlen(numaddr);
  			const char *stringscope = NULL;
 -#if 0
--			if ((flags & NI_NUMERICSCOPE) == 0) {
++
++#ifdef __KAME__
+ 			if ((flags & NI_NUMERICSCOPE) == 0) {
 -				/*
 -				 * Vendors may want to add support for
 -				 * non-numeric scope identifier.
 -				 */
 -				stringscope = foo;
--			}
-+
-+#ifdef __KAME__
-+			stringscope = if_indextoname(
-+			    ((const struct sockaddr_in6 *)sa)->sin6_scope_id);
++				stringscope = if_indextoname(
++				    ((const struct sockaddr_in6 *)sa)->sin6_scope_id);
+ 			}
  #endif
  			if (stringscope == NULL) {
- 				snprintf(p, sizeof(numaddr) - (p - numaddr),
-- 
cgit v1.2.3