Date: Wed, 30 Dec 2009 00:03:37 +0000 (UTC) From: "Bjoern A. Zeeb" <bz@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org Subject: svn commit: r201244 - in stable/7: share/man/man4 sys/netipsec Message-ID: <200912300003.nBU03bjT041219@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bz Date: Wed Dec 30 00:03:36 2009 New Revision: 201244 URL: http://svn.freebsd.org/changeset/base/201244 Log: MFC r199947, 199950: Enable IPcomp by default. PR: kern/123587 Modified: stable/7/share/man/man4/ipsec.4 stable/7/sys/netipsec/xform_ipcomp.c Directory Properties: stable/7/share/man/man4/ (props changed) stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/share/man/man4/ipsec.4 ============================================================================== --- stable/7/share/man/man4/ipsec.4 Tue Dec 29 23:58:32 2009 (r201243) +++ stable/7/share/man/man4/ipsec.4 Wed Dec 30 00:03:36 2009 (r201244) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 5, 2007 +.Dd November 29, 2009 .Dt IPSEC 4 .Os .Sh NAME @@ -213,7 +213,7 @@ To selectively enable/disable protocols, .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 @@ -406,6 +406,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. Modified: stable/7/sys/netipsec/xform_ipcomp.c ============================================================================== --- stable/7/sys/netipsec/xform_ipcomp.c Tue Dec 29 23:58:32 2009 (r201243) +++ stable/7/sys/netipsec/xform_ipcomp.c Wed Dec 30 00:03:36 2009 (r201244) @@ -66,7 +66,7 @@ #include <opencrypto/deflate.h> #include <opencrypto/xform.h> -int ipcomp_enable = 0; +int ipcomp_enable = 1; struct ipcompstat ipcompstat; SYSCTL_DECL(_net_inet_ipcomp);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200912300003.nBU03bjT041219>