git.samba.org
/
obnox
/
samba-ctdb.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9b31a04
)
nfs4_acls: pass ACE_FLAG_INHERITED_ACE down from the client
author
Gregor Beck
<gbeck@sernet.de>
Mon, 23 May 2011 12:45:57 +0000
(14:45 +0200)
committer
Karolin Seeger
<kseeger@samba.org>
Tue, 7 Jun 2011 18:02:15 +0000
(20:02 +0200)
Signed-off-by: Michael Adam <obnox@samba.org>
(cherry picked from commit
817c64f5de65c6ba7cc535446279f769d6552618
)
Fix bug #8191
(cherry picked from commit
009ceeaad12d5b799c0a4249ce473da97a0e3fec
)
source3/modules/nfs4_acls.c
patch
|
blob
|
history
diff --git
a/source3/modules/nfs4_acls.c
b/source3/modules/nfs4_acls.c
index 05487299f82d017ae59aa70744f48b9a35e8a337..2e7d806b848678f1a8d412d78ed6b656f69921f2 100644
(file)
--- 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);