[src/netbsd-3]: src/sys/arch/pmax/conf Pull up revision 1.130 (requested by t...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b46bb814afb5
branches:  netbsd-3
changeset: 576692:b46bb814afb5
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:14:37 2005 +0000

description:
Pull up revision 1.130 (requested by tron in ticket #566):
Add (commented out) IPSEC_NAT_T option.

diffstat:

 sys/arch/pmax/conf/GENERIC |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (26 lines):

diff -r 465616fa3a6d -r b46bb814afb5 sys/arch/pmax/conf/GENERIC
--- a/sys/arch/pmax/conf/GENERIC        Mon Jul 18 21:14:36 2005 +0000
+++ b/sys/arch/pmax/conf/GENERIC        Mon Jul 18 21:14:37 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: GENERIC,v 1.127 2005/02/25 13:46:51 simonb Exp $
+# $NetBSD: GENERIC,v 1.127.2.1 2005/07/18 21:14:37 riz Exp $
 #
 # GENERIC machine description file
 # 
@@ -23,7 +23,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.127 $"
+#ident         "GENERIC-$Revision: 1.127.2.1 $"
 
 maxusers       64
 
@@ -113,6 +113,7 @@
 options        INET6           # IPV6
 #options       IPSEC           # IP security
 #options       IPSEC_ESP       # IP security (encryption part; define w/IPSEC)
+#options       IPSEC_NAT_T     # IPsec NAT traversal (NAT-T)
 #options       IPSEC_DEBUG     # debug for IP security
 options        GATEWAY         # IP packet forwarding
 #options       MROUTING        # Multicast routing support