summaryrefslogtreecommitdiff
path: root/source3/modules
diff options
context:
space:
mode:
authorChristof Schmitt <cs@samba.org>2019-07-02 13:20:44 -0700
committerKarolin Seeger <kseeger@samba.org>2019-08-26 10:23:28 +0000
commit966916dafec9b3e4aacd042dec2c36fd5cec3f53 (patch)
tree3f3c216192a327775050b5675f541bfab54bf2ec /source3/modules
parentff1cee15494121bd41c69dd9c02086660e25f160 (diff)
downloadsamba-966916dafec9b3e4aacd042dec2c36fd5cec3f53.tar.gz
nfs4_acls: Add missing braces in smbacl4_win2nfs4
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> (cherry picked from commit ba73d2363d93a376ba4947963c9de45a7e683f02)
Diffstat (limited to 'source3/modules')
-rw-r--r--source3/modules/nfs4_acls.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index bab73a5cb58..11cb80e9300 100644
--- 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) {