diff options
| author | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2006-12-08 22:31:17 +0000 |
|---|---|---|
| committer | Jun-ichiro itojun Hagino <itojun@cvs.openbsd.org> | 2006-12-08 22:31:17 +0000 |
| commit | 04e88329707cc04e7840da3b0eab51b79cff8227 (patch) | |
| tree | b4a7a659db52d5875309c6d3fecdbb37ce6465ac | |
| parent | dd8254c1e7ead6cee82c89941c590c6aa87cd594 (diff) | |
no need for KAME_SCOPEID; just check __KAME__.
| -rw-r--r-- | usr.sbin/bgpd/Makefile | 5 | ||||
| -rw-r--r-- | usr.sbin/bgpd/rde.c | 4 |
2 files changed, 3 insertions, 6 deletions
diff --git a/usr.sbin/bgpd/Makefile b/usr.sbin/bgpd/Makefile index 4a1572bb86a..c51a6cce387 100644 --- a/usr.sbin/bgpd/Makefile +++ b/usr.sbin/bgpd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.25 2006/06/17 14:06:09 henning Exp $ +# $OpenBSD: Makefile,v 1.26 2006/12/08 22:31:15 itojun Exp $ .PATH: ${.CURDIR}/.. @@ -15,7 +15,4 @@ CFLAGS+= -Wsign-compare YFLAGS= MAN= bgpd.8 bgpd.conf.5 -# kame scopeid hack -CPPFLAGS+=-DKAME_SCOPEID - .include <bsd.prog.mk> diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c index 24403d5317b..554b870a8a6 100644 --- a/usr.sbin/bgpd/rde.c +++ b/usr.sbin/bgpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.213 2006/11/10 14:47:32 henning Exp $ */ +/* $OpenBSD: rde.c,v 1.214 2006/12/08 22:31:16 itojun Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -2575,7 +2575,7 @@ sa_cmp(struct bgpd_addr *a, struct sockaddr *b) break; case AF_INET6: in6_b = (struct sockaddr_in6 *)b; -#if defined(__KAME__) && defined(KAME_SCOPEID) +#ifdef __KAME__ /* directly stolen from sbin/ifconfig/ifconfig.c */ if (IN6_IS_ADDR_LINKLOCAL(&in6_b->sin6_addr)) { in6_b->sin6_scope_id = |