From owner-svn-src-all@FreeBSD.ORG  Thu May 24 10:02:43 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1B23B106566B;
	Thu, 24 May 2012 10:02:43 +0000 (UTC)
	(envelope-from trasz@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 056F58FC12;
	Thu, 24 May 2012 10:02:43 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q4OA2gKu029182;
	Thu, 24 May 2012 10:02:42 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q4OA2gOf029180;
	Thu, 24 May 2012 10:02:42 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201205241002.q4OA2gOf029180@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Thu, 24 May 2012 10:02:42 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r235890 - stable/9/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: Thu, 24 May 2012 10:02:43 -0000

Author: trasz
Date: Thu May 24 10:02:42 2012
New Revision: 235890
URL: http://svn.freebsd.org/changeset/base/235890

Log:
  MFC r234385:
  
  Fix bug where NFSv4 ACL enforcement code wouldn't unconditionally
  allow the owner to read and write ACL and file attributes when there
  was no entry with subject matching the owner.  In other words,
  'getfacl meh' shouldn't fail for the owner if the ACL looks like this:
  
  # file: meh
  # owner: trasz
  # group: wheel
           user:root:------a-------:------:allow

Modified:
  stable/9/sys/kern/subr_acl_nfs4.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/kern/subr_acl_nfs4.c
==============================================================================
--- stable/9/sys/kern/subr_acl_nfs4.c	Thu May 24 09:59:58 2012	(r235889)
+++ stable/9/sys/kern/subr_acl_nfs4.c	Thu May 24 10:02:42 2012	(r235890)
@@ -160,6 +160,9 @@ _acl_denies(const struct acl *aclp, int 
 			return (0);
 	}
 
+	if (access_mask == 0)
+		return (0);
+
 	return (1);
 }