summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGregor Beck <gbeck@sernet.de>2011-05-23 14:45:57 +0200
committerMichael Adam <obnox@samba.org>2011-05-30 17:42:27 +0200
commit817c64f5de65c6ba7cc535446279f769d6552618 (patch)
tree53b067e74006e12cd0e88847721a1989373d9166
parentb0471303ba50caab7da5f50e6f7d8c4b1c664238 (diff)
downloadsamba-817c64f5de65c6ba7cc535446279f769d6552618.tar.gz
samba-817c64f5de65c6ba7cc535446279f769d6552618.tar.bz2
samba-817c64f5de65c6ba7cc535446279f769d6552618.zip
nfs4_acls: pass ACE_FLAG_INHERITED_ACE down from the client
Signed-off-by: Michael Adam <obnox@samba.org>
-rw-r--r--source3/modules/nfs4_acls.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index 32af896eb7..7303d0b08e 100644
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -567,6 +567,9 @@ static bool smbacl4_fill_ace4(
memset(ace_v4, 0, sizeof(SMB_ACE4PROP_T));
ace_v4->aceType = ace_nt->type; /* only ACCESS|DENY supported right now */
ace_v4->aceFlags = ace_nt->flags & SEC_ACE_FLAG_VALID_INHERIT;
+ if (ace_nt->flags & SEC_ACE_FLAG_INHERITED_ACE) {
+ ace_v4->aceFlags |= SMB_ACE4_INHERITED_ACE;
+ }
ace_v4->aceMask = ace_nt->access_mask &
(SEC_STD_ALL | SEC_FILE_ALL);