From 817c64f5de65c6ba7cc535446279f769d6552618 Mon Sep 17 00:00:00 2001 From: Gregor Beck Date: Mon, 23 May 2011 14:45:57 +0200 Subject: nfs4_acls: pass ACE_FLAG_INHERITED_ACE down from the client Signed-off-by: Michael Adam --- source3/modules/nfs4_acls.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/modules/nfs4_acls.c') 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); -- cgit