svn commit: r201510 - in stable/6: share/man/man4 sys/netipsec

[Bjoern A. Zeeb]

Author: bz
Date: Mon Jan  4 15:23:32 2010
New Revision: 201510
URL: http://svn.freebsd.org/changeset/base/201510

Log:
  MFC r199947, 199950:
    Enable IPcomp by default.
  
    (Note that fast_ipsec.4 was changed, rather than ipsec.4.)
  
  PR:   kern/123587

Modified:
  stable/6/share/man/man4/fast_ipsec.4
  stable/6/sys/netipsec/xform_ipcomp.c
Directory Properties:
  stable/6/share/man/man4/   (props changed)
  stable/6/sys/   (props changed)
  stable/6/sys/contrib/pf/   (props changed)
  stable/6/sys/dev/cxgb/   (props changed)

Modified: stable/6/share/man/man4/fast_ipsec.4
==============================================================================
--- stable/6/share/man/man4/fast_ipsec.4	Mon Jan  4 15:22:38 2010	(r201509)
+++ stable/6/share/man/man4/fast_ipsec.4	Mon Jan  4 15:23:32 2010	(r201510)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 20, 2003
+.Dd November 29, 2009
 .Dt FAST_IPSEC 4
 .Os
 .Sh NAME
@@ -112,7 +112,9 @@ There is presently no support for IPv6.
 .Pp
 The
 .Tn IPcomp
-protocol support does not work.
+protocol may occasionally error because of
+.Xr zlib 3
+problems.
 .Pp
 Certain legacy authentication algorithms are not supported because of
 issues with the

Modified: stable/6/sys/netipsec/xform_ipcomp.c
==============================================================================
--- stable/6/sys/netipsec/xform_ipcomp.c	Mon Jan  4 15:22:38 2010	(r201509)
+++ stable/6/sys/netipsec/xform_ipcomp.c	Mon Jan  4 15:23:32 2010	(r201510)
@@ -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);