diff options
author | zack <zack@FreeBSD.org> | 2011-07-16 08:04:57 +0000 |
---|---|---|
committer | zack <zack@FreeBSD.org> | 2011-07-16 08:04:57 +0000 |
commit | 141efa481c94ebc27dd595c54fc42f22480ff9ce (patch) | |
tree | 129d3f6d10204ea7bc6b2cf0004ae518b3b4415c /sys/fs/nfs/nfs_commonsubs.c | |
parent | 19de2b99a58030fa267a8bb2da9b3292dcf13a66 (diff) | |
download | FreeBSD-src-141efa481c94ebc27dd595c54fc42f22480ff9ce.zip FreeBSD-src-141efa481c94ebc27dd595c54fc42f22480ff9ce.tar.gz |
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
Diffstat (limited to 'sys/fs/nfs/nfs_commonsubs.c')
-rw-r--r-- | sys/fs/nfs/nfs_commonsubs.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index 03b5786..2e9eabc0 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -660,9 +660,9 @@ nfsrv_dissectacl(struct nfsrv_descript *nd, NFSACL_T *aclp, int *aclerrp, 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], |