nfs4acls: Introduce a helper variable
authorVolker Lendecke <vl@samba.org>
Tue, 11 Aug 2015 12:13:43 +0000 (14:13 +0200)
committerVolker Lendecke <vl@samba.org>
Thu, 13 Aug 2015 12:40:16 +0000 (14:40 +0200)
... triggered by removing a "==false" condition

Signed-off-by: Volker Lendecke <vl@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
source3/modules/nfs4_acls.c

index 80cd5c0a1ca7ed43bbbb052c6b370138c61e64ca..7968048bdd19146d07efc96da9107b1d64aa15ae 100644 (file)
@@ -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);