diff options
author | bz <bz@FreeBSD.org> | 2009-12-05 19:25:29 +0000 |
---|---|---|
committer | bz <bz@FreeBSD.org> | 2009-12-05 19:25:29 +0000 |
commit | 533f1fdf8235e2ac97b15d592b81d53bce440d97 (patch) | |
tree | 7e199c8597ff4bcfb33d2278efe88b395bd45e2d | |
parent | 1f7b1b46a366d093e39d0974b2a85eda23401b38 (diff) | |
download | FreeBSD-src-533f1fdf8235e2ac97b15d592b81d53bce440d97.zip FreeBSD-src-533f1fdf8235e2ac97b15d592b81d53bce440d97.tar.gz |
MFC r199947, 199950:
Enable IPcomp by default.
PR: kern/123587
-rw-r--r-- | share/man/man4/ipsec.4 | 8 | ||||
-rw-r--r-- | sys/netipsec/xform_ipcomp.c | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/share/man/man4/ipsec.4 b/share/man/man4/ipsec.4 index 47ccdb1..112fadb 100644 --- a/share/man/man4/ipsec.4 +++ b/share/man/man4/ipsec.4 @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd May 23, 2009 +.Dd November 29, 2009 .Dt IPSEC 4 .Os .Sh NAME @@ -215,7 +215,7 @@ To selectively enable/disable protocols, use .It Sy "Name Default" .It "net.inet.esp.esp_enable On" .It "net.inet.ah.ah_enable On" -.It "net.inet.ipcomp.ipcomp_enable Off" +.It "net.inet.ipcomp.ipcomp_enable On" .El .Pp In addition the following variables are accessible via @@ -408,6 +408,8 @@ size may alleviate this problem. .Pp The .Tn IPcomp -protocol support is currently broken. +protocol may occasionally error because of +.Xr zlib 3 +problems. .Pp This documentation needs more review. diff --git a/sys/netipsec/xform_ipcomp.c b/sys/netipsec/xform_ipcomp.c index 4d21e38..d528d2a 100644 --- a/sys/netipsec/xform_ipcomp.c +++ b/sys/netipsec/xform_ipcomp.c @@ -68,7 +68,7 @@ #include <opencrypto/deflate.h> #include <opencrypto/xform.h> -VNET_DEFINE(int, ipcomp_enable) = 0; +VNET_DEFINE(int, ipcomp_enable) = 1; VNET_DEFINE(struct ipcompstat, ipcompstat); SYSCTL_DECL(_net_inet_ipcomp); |