diff options
| author | Gregor Beck <gbeck@sernet.de> | 2011-05-23 14:45:57 +0200 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2011-06-07 20:02:15 +0200 |
| commit | 702f2a826691e1e7f51f2e75c4cdc5c047572b55 (patch) | |
| tree | 87a12716a29fcb9c48a2f0d26cd7bd41e45d63e4 | |
| parent | 9b31a04f6fd1d9abc15cae7ca43d506073e321f1 (diff) | |
| download | samba-702f2a826691e1e7f51f2e75c4cdc5c047572b55.tar.gz | |
nfs4_acls: pass ACE_FLAG_INHERITED_ACE down from the client
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit 817c64f5de65c6ba7cc535446279f769d6552618)
Fix bug #8191
(cherry picked from commit 009ceeaad12d5b799c0a4249ce473da97a0e3fec)
| -rw-r--r-- | source3/modules/nfs4_acls.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 05487299f82..2e7d806b848 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -565,6 +565,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); |