From owner-svn-src-head@FreeBSD.ORG  Thu Oct  8 16:03:20 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 4C598106566B;
	Thu,  8 Oct 2009 16:03:20 +0000 (UTC) (envelope-from pjd@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 3ABE88FC14;
	Thu,  8 Oct 2009 16:03:20 +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 n98G3KfR026928;
	Thu, 8 Oct 2009 16:03:20 GMT (envelope-from pjd@svn.freebsd.org)
Received: (from pjd@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n98G3KxV026926;
	Thu, 8 Oct 2009 16:03:20 GMT (envelope-from pjd@svn.freebsd.org)
Message-Id: <200910081603.n98G3KxV026926@svn.freebsd.org>
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
Date: Thu, 8 Oct 2009 16:03:20 +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: r197860 - head/sys/cddl/compat/opensolaris/kern
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: Thu, 08 Oct 2009 16:03:20 -0000

Author: pjd
Date: Thu Oct  8 16:03:19 2009
New Revision: 197860
URL: http://svn.freebsd.org/changeset/base/197860

Log:
  File system owner is when uid matches and jail matches.
  
  MFC after:	3 days

Modified:
  head/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c

Modified: head/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c
==============================================================================
--- head/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c	Thu Oct  8 15:34:01 2009	(r197859)
+++ head/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c	Thu Oct  8 16:03:19 2009	(r197860)
@@ -78,12 +78,11 @@ secpolicy_fs_owner(struct mount *mp, str
 
 	if (zfs_super_owner) {
 		if (cred->cr_uid == mp->mnt_cred->cr_uid &&
-		    (!jailed(cred) ||
-		     cred->cr_prison == mp->mnt_cred->cr_prison)) {
+		    cred->cr_prison == mp->mnt_cred->cr_prison) {
 			return (0);
 		}
 	}
-	return (priv_check_cred(cred, PRIV_VFS_MOUNT_OWNER, 0));
+	return (EPERM);
 }
 
 /*