diff options
author | gnn <gnn@FreeBSD.org> | 2007-07-01 12:08:08 +0000 |
---|---|---|
committer | gnn <gnn@FreeBSD.org> | 2007-07-01 12:08:08 +0000 |
commit | f5875f045c1546f7504a2a0c4bc6744948772a54 (patch) | |
tree | fb2b82ad120abb3da385b8bf5e6b39f05a558a48 /usr.sbin | |
parent | 1fd78b377e2d3d151697051bcbc05106c7d35c47 (diff) | |
download | FreeBSD-src-f5875f045c1546f7504a2a0c4bc6744948772a54.zip FreeBSD-src-f5875f045c1546f7504a2a0c4bc6744948772a54.tar.gz |
Commit IPv6 support for FAST_IPSEC to the tree.
This commit includes all remaining changes for the time being including
user space updates.
Submitted by: bz
Approved by: re
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/inetd/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/inetd/inetd.c | 2 | ||||
-rw-r--r-- | usr.sbin/rrenumd/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/rrenumd/rrenumd.c | 2 | ||||
-rw-r--r-- | usr.sbin/traceroute6/Makefile | 2 | ||||
-rw-r--r-- | usr.sbin/traceroute6/traceroute6.c | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/usr.sbin/inetd/Makefile b/usr.sbin/inetd/Makefile index 35f2c22..9156afc 100644 --- a/usr.sbin/inetd/Makefile +++ b/usr.sbin/inetd/Makefile @@ -21,7 +21,7 @@ LDADD= -lutil -lwrap # XXX for src/release/picobsd .if !defined(RELEASE_CRUNCH) -CFLAGS+= -DIPSEC +CFLAGS+= -DIPSEC -DFAST_IPSEC DPADD+= ${LIBIPSEC} LDADD+= -lipsec .endif diff --git a/usr.sbin/inetd/inetd.c b/usr.sbin/inetd/inetd.c index 6032462..56791b2 100644 --- a/usr.sbin/inetd/inetd.c +++ b/usr.sbin/inetd/inetd.c @@ -144,7 +144,7 @@ __FBSDID("$FreeBSD$"); #include "pathnames.h" #ifdef IPSEC -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #ifndef IPSEC_POLICY_IPSEC /* no ipsec support on old ipsec */ #undef IPSEC #endif diff --git a/usr.sbin/rrenumd/Makefile b/usr.sbin/rrenumd/Makefile index c31a7c7..52452d0 100644 --- a/usr.sbin/rrenumd/Makefile +++ b/usr.sbin/rrenumd/Makefile @@ -18,7 +18,7 @@ PROG= rrenumd MAN= rrenumd.conf.5 rrenumd.8 SRCS= rrenumd.c parser.y lexer.l -CFLAGS+= -DIPSEC -I. -I${.CURDIR} +CFLAGS+= -DIPSEC -DFAST_IPSEC -I. -I${.CURDIR} YFLAGS= -d LDADD= -lipsec -ll -ly diff --git a/usr.sbin/rrenumd/rrenumd.c b/usr.sbin/rrenumd/rrenumd.c index 2f863d6..fddd6a1 100644 --- a/usr.sbin/rrenumd/rrenumd.c +++ b/usr.sbin/rrenumd/rrenumd.c @@ -49,7 +49,7 @@ #include <arpa/inet.h> #ifdef IPSEC -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #endif #include <stdio.h> diff --git a/usr.sbin/traceroute6/Makefile b/usr.sbin/traceroute6/Makefile index 6ff72d2..cecd20d 100644 --- a/usr.sbin/traceroute6/Makefile +++ b/usr.sbin/traceroute6/Makefile @@ -18,7 +18,7 @@ MAN= traceroute6.8 BINOWN= root BINMODE= 4555 -CFLAGS+= -DIPSEC -DUSE_RFC2292BIS -DHAVE_POLL +CFLAGS+= -DIPSEC -DFAST_IPSEC -DUSE_RFC2292BIS -DHAVE_POLL DPADD= ${LIBIPSEC} LDADD= -lipsec diff --git a/usr.sbin/traceroute6/traceroute6.c b/usr.sbin/traceroute6/traceroute6.c index 327fa84..edc8dc7 100644 --- a/usr.sbin/traceroute6/traceroute6.c +++ b/usr.sbin/traceroute6/traceroute6.c @@ -279,7 +279,7 @@ static const char rcsid[] = #ifdef IPSEC #include <net/route.h> -#include <netinet6/ipsec.h> +#include <netipsec/ipsec.h> #endif #define DUMMY_PORT 10010 |