summaryrefslogtreecommitdiff
path: root/usr.sbin/inetd
diff options
context:
space:
mode:
authorJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2000-06-19 01:28:46 +0000
committerJun-ichiro itojun Hagino <itojun@cvs.openbsd.org>2000-06-19 01:28:46 +0000
commit905d355bdf68bcedba98191abb339676fd656105 (patch)
tree8c119e89921858ef5f35fd645fa1efec48d471c2 /usr.sbin/inetd
parentda306d422a1e0bee073c7b3b6c4605f350792c47 (diff)
honor scopeid when compare ipv6 addrs
Diffstat (limited to 'usr.sbin/inetd')
-rw-r--r--usr.sbin/inetd/inetd.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c
index 0f6acabfa2f..62353ff9c85 100644
--- a/usr.sbin/inetd/inetd.c
+++ b/usr.sbin/inetd/inetd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: inetd.c,v 1.61 2000/03/04 01:10:06 deraadt Exp $ */
+/* $OpenBSD: inetd.c,v 1.62 2000/06/19 01:28:45 itojun Exp $ */
/* $NetBSD: inetd.c,v 1.11 1996/02/22 11:14:41 mycroft Exp $ */
/*
* Copyright (c) 1983,1991 The Regents of the University of California.
@@ -41,7 +41,7 @@ char copyright[] =
#ifndef lint
/*static char sccsid[] = "from: @(#)inetd.c 5.30 (Berkeley) 6/3/91";*/
-static char rcsid[] = "$OpenBSD: inetd.c,v 1.61 2000/03/04 01:10:06 deraadt Exp $";
+static char rcsid[] = "$OpenBSD: inetd.c,v 1.62 2000/06/19 01:28:45 itojun Exp $";
#endif /* not lint */
/*
@@ -1117,6 +1117,10 @@ matchconf (old, new)
&new->se_ctrladdr_in6.sin6_addr,
sizeof(new->se_ctrladdr_in6.sin6_addr)) != 0)
return (0);
+ if (old->se_family == AF_INET6 && new->se_family == AF_INET6 &&
+ old->se_ctrladdr_in6.sin6_scope_id !=
+ new->se_ctrladdr_in6.sin6_scope_id)
+ return (0);
return (1);
}