svn commit: r199947 - in head: share/man/man4 sys/netipsec

[Bjoern A. Zeeb]

Author: bz
Date: Sun Nov 29 20:47:43 2009
New Revision: 199947
URL: http://svn.freebsd.org/changeset/base/199947

Log:
  Enable IPcomp by default.
  
  PR:		kern/123587
  MFC after:	5 days

Modified:
  head/share/man/man4/ipsec.4
  head/sys/netipsec/xform_ipcomp.c

Modified: head/share/man/man4/ipsec.4
==============================================================================
--- head/share/man/man4/ipsec.4	Sun Nov 29 20:37:30 2009	(r199946)
+++ head/share/man/man4/ipsec.4	Sun Nov 29 20:47:43 2009	(r199947)
@@ -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 occationally error because of
+.Xr zlib 3
+problems.
 .Pp
 This documentation needs more review.

Modified: head/sys/netipsec/xform_ipcomp.c
==============================================================================
--- head/sys/netipsec/xform_ipcomp.c	Sun Nov 29 20:37:30 2009	(r199946)
+++ head/sys/netipsec/xform_ipcomp.c	Sun Nov 29 20:47:43 2009	(r199947)
@@ -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);