git.samba.org
/
autobuild.flakey.sn-devel-184
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
336e866
)
nfs4_acls: Add missing braces in smbacl4_win2nfs4
author
Christof Schmitt
<cs@samba.org>
Tue, 2 Jul 2019 20:20:44 +0000
(13:20 -0700)
committer
Christof Schmitt
<cs@samba.org>
Tue, 23 Jul 2019 18:27:26 +0000
(18:27 +0000)
BUG: https://bugzilla.samba.org/show_bug.cgi?id=14032
Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Ralph Boehme <slow@samba.org>
source3/modules/nfs4_acls.c
patch
|
blob
|
history
diff --git
a/source3/modules/nfs4_acls.c
b/source3/modules/nfs4_acls.c
index bab73a5cb58cdbbc779546bf679baef71f0bff4c..11cb80e93006d01c037c046ddf6ae13c7cc2e7cd 100644
(file)
--- a/
source3/modules/nfs4_acls.c
+++ b/
source3/modules/nfs4_acls.c
@@
-905,12
+905,14
@@
static struct SMB4ACL_T *smbacl4_win2nfs4(
if (pparams->acedup!=e_dontcare) {
if (smbacl4_MergeIgnoreReject(pparams->acedup, theacl,
- &ace_v4, &addNewACE, i))
+ &ace_v4, &addNewACE, i)) {
return NULL;
+ }
}
- if (addNewACE)
+ if (addNewACE)
{
smb_add_ace4(theacl, &ace_v4);
+ }
}
if (pparams->mode==e_simple) {