Module Name: src
Committed By: bouyer
Date: Thu Jul 16 15:43:10 UTC 2015
Modified Files:
src/sys/arch/amd64/conf: XEN3_DOM0 XEN3_DOMU
src/sys/arch/i386/conf: XEN3_DOM0 XEN3_DOMU
Log Message:
Uncoment options IPSEC, as requested by Gary Duzan in PR port-amd64/50052
To generate a diff of this commit:
cvs rdiff -u -r1.113 -r1.114 src/sys/arch/amd64/conf/XEN3_DOM0
cvs rdiff -u -r1.61 -r1.62 src/sys/arch/amd64/conf/XEN3_DOMU
cvs rdiff -u -r1.95 -r1.96 src/sys/arch/i386/conf/XEN3_DOM0
cvs rdiff -u -r1.67 -r1.68 src/sys/arch/i386/conf/XEN3_DOMU
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/amd64/conf/XEN3_DOM0
diff -u src/sys/arch/amd64/conf/XEN3_DOM0:1.113 src/sys/arch/amd64/conf/XEN3_DOM0:1.114
--- src/sys/arch/amd64/conf/XEN3_DOM0:1.113 Tue Feb 17 09:21:57 2015
+++ src/sys/arch/amd64/conf/XEN3_DOM0 Thu Jul 16 15:43:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.113 2015/02/17 09:21:57 nonaka Exp $
+# $NetBSD: XEN3_DOM0,v 1.114 2015/07/16 15:43:10 bouyer Exp $
include "arch/amd64/conf/std.xen"
@@ -123,7 +123,7 @@ options UFS_EXTATTR # Extended attribut
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
-#options IPSEC # IP security
+options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
Index: src/sys/arch/amd64/conf/XEN3_DOMU
diff -u src/sys/arch/amd64/conf/XEN3_DOMU:1.61 src/sys/arch/amd64/conf/XEN3_DOMU:1.62
--- src/sys/arch/amd64/conf/XEN3_DOMU:1.61 Tue May 5 22:14:24 2015
+++ src/sys/arch/amd64/conf/XEN3_DOMU Thu Jul 16 15:43:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.61 2015/05/05 22:14:24 pgoyette Exp $
+# $NetBSD: XEN3_DOMU,v 1.62 2015/07/16 15:43:10 bouyer Exp $
include "arch/amd64/conf/std.xen"
@@ -117,7 +117,7 @@ options UFS_EXTATTR # Extended attribut
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPV6
-#options IPSEC # IP security
+options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
Index: src/sys/arch/i386/conf/XEN3_DOM0
diff -u src/sys/arch/i386/conf/XEN3_DOM0:1.95 src/sys/arch/i386/conf/XEN3_DOM0:1.96
--- src/sys/arch/i386/conf/XEN3_DOM0:1.95 Sat May 23 18:13:31 2015
+++ src/sys/arch/i386/conf/XEN3_DOM0 Thu Jul 16 15:43:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOM0,v 1.95 2015/05/23 18:13:31 maxv Exp $
+# $NetBSD: XEN3_DOM0,v 1.96 2015/07/16 15:43:10 bouyer Exp $
#
# XEN3_0: Xen 3.0 domain0 kernel
@@ -146,7 +146,7 @@ options UFS_EXTATTR # Extended attribut
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
-#options IPSEC # IP security
+options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
Index: src/sys/arch/i386/conf/XEN3_DOMU
diff -u src/sys/arch/i386/conf/XEN3_DOMU:1.67 src/sys/arch/i386/conf/XEN3_DOMU:1.68
--- src/sys/arch/i386/conf/XEN3_DOMU:1.67 Sat May 23 18:13:31 2015
+++ src/sys/arch/i386/conf/XEN3_DOMU Thu Jul 16 15:43:10 2015
@@ -1,4 +1,4 @@
-# $NetBSD: XEN3_DOMU,v 1.67 2015/05/23 18:13:31 maxv Exp $
+# $NetBSD: XEN3_DOMU,v 1.68 2015/07/16 15:43:10 bouyer Exp $
include "arch/xen/conf/std.xen"
@@ -135,7 +135,7 @@ options UFS_EXTATTR # Extended attribut
#options GATEWAY # packet forwarding
options INET # IP + ICMP + TCP + UDP
options INET6 # IPv6
-#options IPSEC # IP security
+options IPSEC # IP security
#options IPSEC_DEBUG # debug for IP security
#options MROUTING # IP multicast routing
#options PIM # Protocol Independent Multicast
