svn commit: r224843 - in stable/8/sys/fs: nfs nfsserver

[Zack Kirsch]

Author: zack
Date: Sat Aug 13 17:08:57 2011
New Revision: 224843
URL: http://svn.freebsd.org/changeset/base/224843

Log:
  MFC: r224077
    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.

Modified:
  stable/8/sys/fs/nfs/nfs_commonsubs.c
  stable/8/sys/fs/nfsserver/nfs_nfsdport.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/fs/nfs/nfs_commonsubs.c
==============================================================================
--- stable/8/sys/fs/nfs/nfs_commonsubs.c	Sat Aug 13 16:03:40 2011	(r224842)
+++ stable/8/sys/fs/nfs/nfs_commonsubs.c	Sat Aug 13 17:08:57 2011	(r224843)
@@ -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: stable/8/sys/fs/nfsserver/nfs_nfsdport.c
==============================================================================
--- stable/8/sys/fs/nfsserver/nfs_nfsdport.c	Sat Aug 13 16:03:40 2011	(r224842)
+++ stable/8/sys/fs/nfsserver/nfs_nfsdport.c	Sat Aug 13 17:08:57 2011	(r224843)
@@ -2301,7 +2301,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: