From owner-svn-src-all@FreeBSD.ORG  Mon Jan  4 15:23:32 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B302A106568F;
	Mon,  4 Jan 2010 15:23:32 +0000 (UTC) (envelope-from bz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A00E68FC12;
	Mon,  4 Jan 2010 15:23:32 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o04FNWYS097581;
	Mon, 4 Jan 2010 15:23:32 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o04FNWpX097578;
	Mon, 4 Jan 2010 15:23:32 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <201001041523.o04FNWpX097578@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Mon, 4 Jan 2010 15:23:32 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-6@freebsd.org
X-SVN-Group: stable-6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r201510 - in stable/6: share/man/man4 sys/netipsec
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 Jan 2010 15:23:32 -0000

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);