From owner-svn-src-all@FreeBSD.ORG  Sat Jul 16 08:04:57 2011
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 D38C21065674;
	Sat, 16 Jul 2011 08:04:57 +0000 (UTC)
	(envelope-from zack@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C5AF38FC17;
	Sat, 16 Jul 2011 08:04:57 +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 p6G84v3Q016188;
	Sat, 16 Jul 2011 08:04:57 GMT (envelope-from zack@svn.freebsd.org)
Received: (from zack@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id p6G84vr5016185;
	Sat, 16 Jul 2011 08:04:57 GMT (envelope-from zack@svn.freebsd.org)
Message-Id: <201107160804.p6G84vr5016185@svn.freebsd.org>
From: Zack Kirsch <zack@FreeBSD.org>
Date: Sat, 16 Jul 2011 08:04:57 +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: r224077 - in head/sys/fs: nfs nfsserver
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: Sat, 16 Jul 2011 08:04:57 -0000

Author: zack
Date: Sat Jul 16 08:04:57 2011
New Revision: 224077
URL: http://svn.freebsd.org/changeset/base/224077

Log:
  Small acl patch to return the aclerror that comes back from nfsrv_dissectacl(). This fixes a problem where ATTRNOTSUPP was being returned instead of BADOWNER.
  
  Reviewed by:    rmacklem
  Approved by:    zml (mentor)
  MFC after:      2 weeks

Modified:
  head/sys/fs/nfs/nfs_commonsubs.c
  head/sys/fs/nfsserver/nfs_nfsdport.c

Modified: head/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- head/sys/fs/nfs/nfs_commonsubs.c	Sat Jul 16 07:12:02 2011	(r224076)
+++ head/sys/fs/nfs/nfs_commonsubs.c	Sat Jul 16 08:04:57 2011	(r224077)
@@ -660,9 +660,9 @@ nfsrv_dissectacl(struct nfsrv_descript *
 	aclsize = NFSX_UNSIGNED;
 	acecnt = fxdr_unsigned(int, *tl);
 	if (acecnt > ACL_MAX_ENTRIES)
-		aceerr = 1;
+		aceerr = NFSERR_ATTRNOTSUPP;
 	if (nfsrv_useacl == 0)
-		aceerr = 1;
+		aceerr = NFSERR_ATTRNOTSUPP;
 	for (i = 0; i < acecnt; i++) {
 		if (aclp && !aceerr)
 			error = nfsrv_dissectace(nd, &aclp->acl_entry[i],

Modified: head/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- head/sys/fs/nfsserver/nfs_nfsdport.c	Sat Jul 16 07:12:02 2011	(r224076)
+++ head/sys/fs/nfsserver/nfs_nfsdport.c	Sat Jul 16 08:04:57 2011	(r224077)
@@ -2304,7 +2304,7 @@ nfsv4_sattr(struct nfsrv_descript *nd, s
 			if (error)
 				goto nfsmout;
 			if (aceerr && !nd->nd_repstat)
-				nd->nd_repstat = NFSERR_ATTRNOTSUPP;
+				nd->nd_repstat = aceerr;
 			attrsum += aclsize;
 			break;
 		case NFSATTRBIT_ARCHIVE: