svn commit: r200149 - in stable/8: share/man/man4 sys/netipsec

[Bjoern A. Zeeb]

Author: bz
Date: Sat Dec  5 19:25:29 2009
New Revision: 200149
URL: http://svn.freebsd.org/changeset/base/200149

Log:
  MFC r199947, 199950:
    Enable IPcomp by default.
  
  PR:	kern/123587

Modified:
  stable/8/share/man/man4/ipsec.4
  stable/8/sys/netipsec/xform_ipcomp.c
Directory Properties:
  stable/8/share/man/man4/   (props changed)
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)

Modified: stable/8/share/man/man4/ipsec.4
==============================================================================
--- stable/8/share/man/man4/ipsec.4	Sat Dec  5 19:21:58 2009	(r200148)
+++ stable/8/share/man/man4/ipsec.4	Sat Dec  5 19:25:29 2009	(r200149)
@@ -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,
 .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.

Modified: stable/8/sys/netipsec/xform_ipcomp.c
==============================================================================
--- stable/8/sys/netipsec/xform_ipcomp.c	Sat Dec  5 19:21:58 2009	(r200148)
+++ stable/8/sys/netipsec/xform_ipcomp.c	Sat Dec  5 19:25:29 2009	(r200149)
@@ -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);