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

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

details:   https://anonhg.NetBSD.org/src/rev/2aa2ba346c05
branches:  netbsd-3
changeset: 576630:2aa2ba346c05
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:12:38 2005 +0000

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

diffstat:

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

diffs (26 lines):

diff -r 8ef8ab631425 -r 2aa2ba346c05 sys/arch/shark/conf/GENERIC
--- a/sys/arch/shark/conf/GENERIC       Mon Jul 18 21:06:51 2005 +0000
+++ b/sys/arch/shark/conf/GENERIC       Mon Jul 18 21:12:38 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: GENERIC,v 1.44 2005/02/21 20:36:37 christos Exp $
+#      $NetBSD: GENERIC,v 1.44.2.1 2005/07/18 21:12:38 riz Exp $
 #
 # Generic Shark configuration.
 #
@@ -7,7 +7,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident         "GENERIC-$Revision: 1.44 $"
+#ident         "GENERIC-$Revision: 1.44.2.1 $"
 
 # estimated number of users
 maxusers       32
@@ -74,6 +74,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       MROUTING        # IP multicast routing
 #options       PIM             # Protocol Independent Multicast