From: Christof Schmitt <cs@samba.org>
Date: Tue, 2 Jul 2019 20:20:44 +0000 (-0700)
Subject: nfs4_acls: Add missing braces in smbacl4_win2nfs4
X-Git-Tag: samba-4.9.12~17
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=966916dafec9b3e4aacd042dec2c36fd5cec3f53;p=thirdparty%2Fsamba.git

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)
---

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) {