summaryrefslogtreecommitdiff
path: root/sys/conf
diff options
context:
space:
mode:
authorNiklas Hallqvist <niklas@cvs.openbsd.org>1999-04-11 19:47:11 +0000
committerNiklas Hallqvist <niklas@cvs.openbsd.org>1999-04-11 19:47:11 +0000
commit9089ff221ec6a3b3e379188aa96052b59366a841 (patch)
tree86dbc2304f70f01eb1606b1a55216233253fa5a4 /sys/conf
parent7ab4566c34fb0c170d5805b34cd71d628eb1b501 (diff)
Reenable IPSEC now that it is off by default, but can be enabled via sysctl
Diffstat (limited to 'sys/conf')
-rw-r--r--sys/conf/GENERIC6
1 files changed, 3 insertions, 3 deletions
diff --git a/sys/conf/GENERIC b/sys/conf/GENERIC
index a60d62f867c..3bc4888aa91 100644
--- a/sys/conf/GENERIC
+++ b/sys/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.46 1999/04/07 07:20:31 deraadt Exp $
+# $OpenBSD: GENERIC,v 1.47 1999/04/11 19:47:10 niklas Exp $
#
# Machine-independent option; used by all architectures for their
# GENERIC kernel
@@ -56,7 +56,7 @@ option UNION # union file system
#option GATEWAY # packet forwarding
option INET # IP + ICMP + TCP + UDP
-#option IPSEC # IPsec
+option IPSEC # IPsec
#option KEY # PF_KEY (implied by IPSEC)
#option NS # XNS
#option NSIP # XNS tunneling over IP
@@ -75,7 +75,7 @@ pseudo-device bpfilter 8 # packet filter
pseudo-device sl 2 # CSLIP
pseudo-device ppp 2 # PPP
pseudo-device tun 2 # network tunneling over tty
-#pseudo-device enc 1 # IPSEC needs the encryption device
+pseudo-device enc 1 # IPSEC needs the encapsulation interface
#pseudo-device strip 1 # Starmode Radio IP interface
pseudo-device pty 64 # pseudo-terminals