summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorCedric Berger <cedric@cvs.openbsd.org>2004-02-02 20:13:02 +0000
committerCedric Berger <cedric@cvs.openbsd.org>2004-02-02 20:13:02 +0000
commit418cc6471219814febd45ea48f4a83277e56f08f (patch)
tree63f13edfa1fc637748529d5e3717f06fd0734e2e /sys
parent0753dedde11a7792bc33417016c29c1df28c7dfa (diff)
make the stack compile if NPF=0. ok deraadt@ markus@
Diffstat (limited to 'sys')
-rw-r--r--sys/netinet6/ip6_forward.c5
-rw-r--r--sys/netinet6/ip6_output.c3
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/netinet6/ip6_forward.c b/sys/netinet6/ip6_forward.c
index 514747339c5..342d49d1b8b 100644
--- a/sys/netinet6/ip6_forward.c
+++ b/sys/netinet6/ip6_forward.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_forward.c,v 1.27 2003/08/07 09:11:53 itojun Exp $ */
+/* $OpenBSD: ip6_forward.c,v 1.28 2004/02/02 20:13:01 cedric Exp $ */
/* $KAME: ip6_forward.c,v 1.75 2001/06/29 12:42:13 jinmei Exp $ */
/*
@@ -60,6 +60,7 @@
#endif
#ifdef IPSEC
+#include <netinet/ip_ipsp.h>
#include <netinet/ip_ah.h>
#include <netinet/ip_esp.h>
#include <netinet/udp.h>
@@ -453,7 +454,7 @@ ip6_forward(m, srcrt)
}
}
-#if NPF > 0
+#if NPF > 0 || defined(IPSEC)
senderr:
#endif
if (mcopy == NULL)
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 15822664b40..eeada73d0c2 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_output.c,v 1.80 2003/12/10 03:30:21 itojun Exp $ */
+/* $OpenBSD: ip6_output.c,v 1.81 2004/02/02 20:13:01 cedric Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -92,6 +92,7 @@
#endif
#ifdef IPSEC
+#include <netinet/ip_ipsp.h>
#include <netinet/ip_ah.h>
#include <netinet/ip_esp.h>
#include <netinet/udp.h>