>Number:         7925
>Category:       kern
>Synopsis:       ipcomp_{in,out}put.c won't build without INET6
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    kern-bug-people (Kernel Bug People)
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Jul  5 20:35:00 1999
>Last-Modified:
>Originator:     Charlie Root
>Organization:
	none
>Release:        7/5/99
>Environment:
	
System: NetBSD groo-the-wanderer.waterside.net 1.4D NetBSD 1.4D (GROO) #0: Mon Jul 5 11:34:43 EDT 1999 rafal@groo-the-wanderer.old-oak.net:/usr/src/sys/arch/i386/compile/GROO i386


>Description:
	ipcomp_input.c and ipcomp_output.c don't include enough headers if 
	building without INET6 (netinet6/ipsec.h and netkey/keyv2.h aren't
	included if !INET6 build).  Compiler whines, kernel doesn't build,
	user is unhappy.
>How-To-Repeat:
	build kernel with IPSEC but no INET6
>Fix:

--- ipcomp_input.c.orig	Mon Jul  5 11:20:44 1999
+++ ipcomp_input.c	Mon Jul  5 18:26:46 1999
@@ -72,8 +72,11 @@
 #endif
 #include <netinet6/ipcomp.h>
 
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__)
 #include <netinet6/ipsec.h>
+#endif
+#if defined(__NetBSD__)
+#include <netkey/keyv2.h>
 #endif
 #include <netkey/key.h>
 #include <netkey/keydb.h>

--- ipcomp_output.c.orig	Mon Jul  5 11:24:49 1999
+++ ipcomp_output.c	Mon Jul  5 18:26:55 1999
@@ -72,8 +72,11 @@
 #endif
 #include <netinet6/ipcomp.h>
 
-#if defined(__FreeBSD__) && __FreeBSD__ >= 3
+#if (defined(__FreeBSD__) && __FreeBSD__ >= 3) || defined(__NetBSD__)
 #include <netinet6/ipsec.h>
+#endif
+#if defined(__NetBSD__)
+#include <netkey/keyv2.h>
 #endif
 #include <netkey/key.h>
 #include <netkey/keydb.h>
>Audit-Trail:
>Unformatted: