summaryrefslogtreecommitdiffstats
path: root/sys/fs
diff options
context:
space:
mode:
authortrasz <trasz@FreeBSD.org>2015-08-28 14:26:11 +0000
committertrasz <trasz@FreeBSD.org>2015-08-28 14:26:11 +0000
commit1604109813c469cd7af1db22659ad5d40dcf628c (patch)
tree0dd96ba11f88cca3e7d066efab497e06d006c21d /sys/fs
parenta541e005da1e963f00d9201bd40df4f1bb8d4c88 (diff)
downloadFreeBSD-src-1604109813c469cd7af1db22659ad5d40dcf628c.zip
FreeBSD-src-1604109813c469cd7af1db22659ad5d40dcf628c.tar.gz
Fix an NFS server bug that manifested in "ls -al" displaying a plus
sign on every directory exported via NFSv4 with NFSv4 ACLs enabled. Reviewed by: rmacklem@ MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D3502
Diffstat (limited to 'sys/fs')
-rw-r--r--sys/fs/nfs/nfs_commonacl.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sys/fs/nfs/nfs_commonacl.c b/sys/fs/nfs/nfs_commonacl.c
index fdfbd8d..0201e2d 100644
--- a/sys/fs/nfs/nfs_commonacl.c
+++ b/sys/fs/nfs/nfs_commonacl.c
@@ -347,6 +347,8 @@ nfsrv_buildace(struct nfsrv_descript *nd, u_char *name, int namelen,
acemask |= NFSV4ACE_WRITEACL;
if (ace->ae_perm & ACL_WRITE_OWNER)
acemask |= NFSV4ACE_WRITEOWNER;
+ if (ace->ae_perm & ACL_SYNCHRONIZE)
+ acemask |= NFSV4ACE_SYNCHRONIZE;
} else {
if (ace->ae_perm & ACL_READ_DATA)
acemask |= NFSV4ACE_READDATA;
OpenPOWER on IntegriCloud