diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-03-30 00:19:06 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1999-03-30 00:19:06 +0000 |
| commit | 29e92409238cb10030480f30250954966df1bded (patch) | |
| tree | 0fc7c0a99dd62ecd21b5d00c083990e9f7f9e611 /sys/conf | |
| parent | eea98f417bfe88745366fa281f227fa9a8942dff (diff) | |
make option IPSEC imply option KEY
Diffstat (limited to 'sys/conf')
| -rw-r--r-- | sys/conf/GENERIC | 4 | ||||
| -rw-r--r-- | sys/conf/files | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC index 84f07198272..ba41a82de9c 100644 --- a/sys/conf/GENERIC +++ b/sys/conf/GENERIC @@ -1,4 +1,4 @@ -# $OpenBSD: GENERIC,v 1.43 1999/02/28 06:52:05 deraadt Exp $ +# $OpenBSD: GENERIC,v 1.44 1999/03/30 00:19:05 niklas Exp $ # # Machine-independent option; used by all architectures for their # GENERIC kernel @@ -57,7 +57,7 @@ option UNION # union file system #option GATEWAY # packet forwarding option INET # IP + ICMP + TCP + UDP option IPSEC # IPsec -option KEY # PF_KEY +#option KEY # PF_KEY (implied by IPSEC) #option NS # XNS #option NSIP # XNS tunneling over IP #option IPX # IPX+SPX diff --git a/sys/conf/files b/sys/conf/files index ce22d2a0eb6..9e83b2a126f 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1,4 +1,4 @@ -# $OpenBSD: files,v 1.112 1999/03/17 05:33:11 mjacob Exp $ +# $OpenBSD: files,v 1.113 1999/03/30 00:19:04 niklas Exp $ # $NetBSD: files,v 1.87 1996/05/19 17:17:50 jonathan Exp $ # @(#)files.newconf 7.5 (Berkeley) 5/10/93 @@ -636,6 +636,6 @@ file netinet6/in6_proto.c inet6 file netinet6/ipv6_trans.c inet6 # ... PF_KEY -file net/pfkey.c key -file net/pfkeyv2.c key -file net/pfkeyv2_parsemessage.c key +file net/pfkey.c key | ipsec +file net/pfkeyv2.c key | ipsec +file net/pfkeyv2_parsemessage.c key | ipsec |