From owner-svn-src-all@FreeBSD.ORG Wed Dec 30 00:03:37 2009 Return-Path: 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 4691B106566B; Wed, 30 Dec 2009 00:03:37 +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 355138FC0A; Wed, 30 Dec 2009 00:03:37 +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 nBU03bTl041222; Wed, 30 Dec 2009 00:03:37 GMT (envelope-from bz@svn.freebsd.org) Received: (from bz@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id nBU03bjT041219; Wed, 30 Dec 2009 00:03:37 GMT (envelope-from bz@svn.freebsd.org) Message-Id: <200912300003.nBU03bjT041219@svn.freebsd.org> From: "Bjoern A. Zeeb" Date: Wed, 30 Dec 2009 00:03:37 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r201244 - in stable/7: 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Dec 2009 00:03:37 -0000 Author: bz Date: Wed Dec 30 00:03:36 2009 New Revision: 201244 URL: http://svn.freebsd.org/changeset/base/201244 Log: MFC r199947, 199950: Enable IPcomp by default. PR: kern/123587 Modified: stable/7/share/man/man4/ipsec.4 stable/7/sys/netipsec/xform_ipcomp.c Directory Properties: stable/7/share/man/man4/ (props changed) stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/share/man/man4/ipsec.4 ============================================================================== --- stable/7/share/man/man4/ipsec.4 Tue Dec 29 23:58:32 2009 (r201243) +++ stable/7/share/man/man4/ipsec.4 Wed Dec 30 00:03:36 2009 (r201244) @@ -29,7 +29,7 @@ .\" .\" $FreeBSD$ .\" -.Dd August 5, 2007 +.Dd November 29, 2009 .Dt IPSEC 4 .Os .Sh NAME @@ -213,7 +213,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 @@ -406,6 +406,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/7/sys/netipsec/xform_ipcomp.c ============================================================================== --- stable/7/sys/netipsec/xform_ipcomp.c Tue Dec 29 23:58:32 2009 (r201243) +++ stable/7/sys/netipsec/xform_ipcomp.c Wed Dec 30 00:03:36 2009 (r201244) @@ -66,7 +66,7 @@ #include #include -int ipcomp_enable = 0; +int ipcomp_enable = 1; struct ipcompstat ipcompstat; SYSCTL_DECL(_net_inet_ipcomp);