From owner-svn-src-head@FreeBSD.ORG  Sun Nov 29 20:47:44 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 345AD106566C;
	Sun, 29 Nov 2009 20:47:44 +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 1AA838FC15;
	Sun, 29 Nov 2009 20:47:44 +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 nATKlh1U008714;
	Sun, 29 Nov 2009 20:47:43 GMT (envelope-from bz@svn.freebsd.org)
Received: (from bz@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id nATKlh66008711;
	Sun, 29 Nov 2009 20:47:43 GMT (envelope-from bz@svn.freebsd.org)
Message-Id: <200911292047.nATKlh66008711@svn.freebsd.org>
From: "Bjoern A. Zeeb" <bz@FreeBSD.org>
Date: Sun, 29 Nov 2009 20:47:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r199947 - in head: share/man/man4 sys/netipsec
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 29 Nov 2009 20:47:44 -0000

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