From 6ed8672880a7960493b91ea5c9ba8dc8132a2a1b Mon Sep 17 00:00:00 2001
From: itojun <itojun@NetBSD.org>
Date: Sun, 9 Jun 2002 19:59:55 +0000
Subject: [PATCH] no need for KAME_SCOPEID any longer

---
 usr.sbin/syslogd/Makefile  | 5 +----
 usr.sbin/syslogd/syslogd.c | 8 ++------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/usr.sbin/syslogd/Makefile b/usr.sbin/syslogd/Makefile
index 3f746167548c..8153e6a2e7c8 100644
--- a/usr.sbin/syslogd/Makefile
+++ b/usr.sbin/syslogd/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.15 2001/07/01 16:23:42 itojun Exp $
+#	$NetBSD: Makefile,v 1.16 2002/06/09 19:59:55 itojun Exp $
 #	from: @(#)Makefile	8.1 (Berkeley) 6/6/93
 
 PROG=	syslogd
@@ -9,9 +9,6 @@ LDADD+=-lutil
 SYMLINKS=	/var/run/log /dev/log
 CPPFLAGS+=-DINET6
 
-# KAME scopeid hack
-#CPPFLAGS+=-DKAME_SCOPEID
-
 CPPFLAGS+=-DLIBWRAP
 LDADD+=	-lwrap
 DPADD+=	${LIBWRAP}
diff --git a/usr.sbin/syslogd/syslogd.c b/usr.sbin/syslogd/syslogd.c
index 8528a668ed20..7a93882e6d4c 100644
--- a/usr.sbin/syslogd/syslogd.c
+++ b/usr.sbin/syslogd/syslogd.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: syslogd.c,v 1.53 2002/05/25 14:46:01 wiz Exp $	*/
+/*	$NetBSD: syslogd.c,v 1.54 2002/06/09 19:59:55 itojun Exp $	*/
 
 /*
  * Copyright (c) 1983, 1988, 1993, 1994
@@ -43,7 +43,7 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993, 1994\n\
 #if 0
 static char sccsid[] = "@(#)syslogd.c	8.3 (Berkeley) 4/4/94";
 #else
-__RCSID("$NetBSD: syslogd.c,v 1.53 2002/05/25 14:46:01 wiz Exp $");
+__RCSID("$NetBSD: syslogd.c,v 1.54 2002/06/09 19:59:55 itojun Exp $");
 #endif
 #endif /* not lint */
 
@@ -1013,11 +1013,7 @@ cvthname(struct sockaddr_storage *f)
 {
 	int error;
 	char *p;
-#ifdef KAME_SCOPEID
-	const int niflag = NI_DGRAM | NI_WITHSCOPEID;
-#else
 	const int niflag = NI_DGRAM;
-#endif
 	static char host[NI_MAXHOST], ip[NI_MAXHOST];
 
 	error = getnameinfo((struct sockaddr*)f, ((struct sockaddr*)f)->sa_len,