From 9287b6788d69f7fc481a4c857ba1e7646544072f Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Tue, 11 Aug 2015 14:13:43 +0200 Subject: [PATCH] nfs4acls: Introduce a helper variable ... triggered by removing a "==false" condition Signed-off-by: Volker Lendecke Reviewed-by: Stefan Metzmacher --- source3/modules/nfs4_acls.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index 80cd5c0a1ca..7968048bdd1 100644 --- a/source3/modules/nfs4_acls.c +++ b/source3/modules/nfs4_acls.c @@ -483,6 +483,7 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf, struct security_ace *nt_ace_list = NULL; struct security_acl *psa = NULL; TALLOC_CTX *frame = talloc_stackframe(); + bool ok; if (theacl==NULL) { TALLOC_FREE(frame); @@ -494,9 +495,10 @@ static NTSTATUS smb_get_nt_acl_nfs4_common(const SMB_STRUCT_STAT *sbuf, uid_to_sid(&sid_owner, sbuf->st_ex_uid); gid_to_sid(&sid_group, sbuf->st_ex_gid); - if (smbacl4_nfs42win(mem_ctx, params, theacl, &sid_owner, &sid_group, - S_ISDIR(sbuf->st_ex_mode), - &nt_ace_list, &good_aces)==false) { + ok = smbacl4_nfs42win(mem_ctx, params, theacl, &sid_owner, &sid_group, + S_ISDIR(sbuf->st_ex_mode), + &nt_ace_list, &good_aces); + if (!ok) { DEBUG(8,("smbacl4_nfs42win failed\n")); TALLOC_FREE(frame); return map_nt_error_from_unix(errno); -- 2.11.4.GIT