Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-3]: src/sys/arch/sparc/conf Pull up revision 1.9 (requested by tr...



details:   https://anonhg.NetBSD.org/src/rev/ecefb57e1892
branches:  netbsd-3
changeset: 576644:ecefb57e1892
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Jul 18 21:13:06 2005 +0000

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

diffstat:

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

diffs (26 lines):

diff -r 7bfac6cf7983 -r ecefb57e1892 sys/arch/sparc/conf/MRCOFFEE
--- a/sys/arch/sparc/conf/MRCOFFEE      Mon Jul 18 21:13:05 2005 +0000
+++ b/sys/arch/sparc/conf/MRCOFFEE      Mon Jul 18 21:13:06 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: MRCOFFEE,v 1.7 2005/02/18 21:05:54 dsl Exp $
+# $NetBSD: MRCOFFEE,v 1.7.4.1 2005/07/18 21:13:06 riz Exp $
 # From: NetBSD: GENERIC,v 1.160 2004/07/10 12:05:35 uwe Exp
 #
 # Mr.Coffee (JavaStation 1) machine description file
@@ -12,7 +12,7 @@
 
 options        INCLUDE_CONFIG_FILE     # embed config file in kernel binary
 
-#ident                 "MRCOFFEE-$Revision: 1.7 $"
+#ident                 "MRCOFFEE-$Revision: 1.7.4.1 $"
 
 maxusers       32
 
@@ -188,6 +188,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         # packet forwarding ("router switch")
 #options       MROUTING        # packet forwarding of multicast packets



Home | Main Index | Thread Index | Old Index