kernel/1563: 2.8-STABLE kernel can't be compiled without INET6

[Rémi Guyomarch <rguyom@pobox.com>]

>Number:         1563
>Category:       kernel
>Synopsis:       2.8-STABLE kernel can't be compiled without INET6
>Confidential:   no
>Severity:       non-critical
>Priority:       high
>Responsible:    bugs
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Dec 14 06:30:02 MST 2000
>Last-Modified:
>Originator:     Rémi Guyomarch
>Organization:
net
>Release:        OPENBSD_2_8
>Environment:
	System      : OpenBSD 2.8
	Architecture: OpenBSD.i386
	Machine     : i386
>Description:
	Can't compile a kernel from the OPENBSD_2_8 CVS branch with IPSEC
but without INET6.
>How-To-Repeat:
	Checkout the OPENBSD_2_8 branch, configure the kernel with IPSEC and
without INET6 and try to compile it.
>Fix:

Index: sys/netinet/ip_spd.c
===================================================================
RCS file: /usr/cvs/src/sys/netinet/ip_spd.c,v
retrieving revision 1.6.2.1
diff -u -r1.6.2.1 ip_spd.c
--- sys/netinet/ip_spd.c	2000/12/14 05:37:46	1.6.2.1
+++ sys/netinet/ip_spd.c	2000/12/14 13:17:56
@@ -413,11 +413,15 @@
 	 */
 	if (((ipo->ipo_dst.sa.sa_family == AF_INET) &&
 	     (ipo->ipo_dst.sin.sin_addr.s_addr != INADDR_ANY) &&
-	     (ipo->ipo_dst.sin.sin_addr.s_addr != INADDR_BROADCAST)) ||
+	     (ipo->ipo_dst.sin.sin_addr.s_addr != INADDR_BROADCAST))
+#ifdef INET6
+	    ||
 	    ((ipo->ipo_dst.sa.sa_family == AF_INET6) &&
 	     !IN6_IS_ADDR_UNSPECIFIED(&ipo->ipo_dst.sin6.sin6_addr) &&
 	     bcmp(&ipo->ipo_dst.sin6.sin6_addr, &in6mask128,
-		  sizeof(in6mask128))))
+		  sizeof(in6mask128)))
+#endif /* INET6 */
+		  )
 	{
 	    if (ipo->ipo_last_searched <= ipsec_last_added)
 	    {

>Audit-Trail:
>Unformatted: