From owner-svn-src-all@FreeBSD.ORG  Fri Jul 31 16:00:41 2009
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 9AB901065672;
	Fri, 31 Jul 2009 16:00:41 +0000 (UTC)
	(envelope-from jamie@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 88E088FC1B;
	Fri, 31 Jul 2009 16:00:41 +0000 (UTC)
	(envelope-from jamie@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n6VG0fCY074161;
	Fri, 31 Jul 2009 16:00:41 GMT (envelope-from jamie@svn.freebsd.org)
Received: (from jamie@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n6VG0fJ0074159;
	Fri, 31 Jul 2009 16:00:41 GMT (envelope-from jamie@svn.freebsd.org)
Message-Id: <200907311600.n6VG0fJ0074159@svn.freebsd.org>
From: Jamie Gritton <jamie@FreeBSD.org>
Date: Fri, 31 Jul 2009 16:00:41 +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: r196002 - head/sys/kern
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: Fri, 31 Jul 2009 16:00:42 -0000

Author: jamie
Date: Fri Jul 31 16:00:41 2009
New Revision: 196002
URL: http://svn.freebsd.org/changeset/base/196002

Log:
  Make the "enforce_statfs" default 2 (most restrictive) in jail_set(2),
  instead of whatever the parent/system has (which is generally 0).  This
  mirrors the old-style default used for jail(2) in conjunction with the
  security.jail.enforce_statfs sysctl.
  
  Approved by:	re (kib), bz (mentor)

Modified:
  head/sys/kern/kern_jail.c

Modified: head/sys/kern/kern_jail.c
==============================================================================
--- head/sys/kern/kern_jail.c	Fri Jul 31 15:27:14 2009	(r196001)
+++ head/sys/kern/kern_jail.c	Fri Jul 31 16:00:41 2009	(r196002)
@@ -165,9 +165,10 @@ static char *pr_allow_nonames[] = {
 	"allow.nosocket_af",
 };
 
-#define	JAIL_DEFAULT_ALLOW	PR_ALLOW_SET_HOSTNAME
+#define	JAIL_DEFAULT_ALLOW		PR_ALLOW_SET_HOSTNAME
+#define	JAIL_DEFAULT_ENFORCE_STATFS	2
 static unsigned jail_default_allow = JAIL_DEFAULT_ALLOW;
-static int jail_default_enforce_statfs = 2;
+static int jail_default_enforce_statfs = JAIL_DEFAULT_ENFORCE_STATFS;
 #if defined(INET) || defined(INET6)
 static unsigned jail_max_af_ips = 255;
 #endif
@@ -1181,7 +1182,7 @@ kern_jail_set(struct thread *td, struct 
 #endif
 		pr->pr_securelevel = ppr->pr_securelevel;
 		pr->pr_allow = JAIL_DEFAULT_ALLOW & ppr->pr_allow;
-		pr->pr_enforce_statfs = ppr->pr_enforce_statfs;
+		pr->pr_enforce_statfs = JAIL_DEFAULT_ENFORCE_STATFS;
 
 		LIST_INIT(&pr->pr_children);
 		mtx_init(&pr->pr_mtx, "jail mutex", NULL, MTX_DEF | MTX_DUPOK);