r18785: Check in Peter Somogyis build fix

(This used to be commit 31c1be90565b2d2d111dddb7f0563fa8c303852b)

diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c
index caa2f9503c731c0dd8c56622d03ee6cff45cc190..91ebba1f5889bd2e2e4c361c74bbbbc998df67ed 100644 (file)
--- a/source3/modules/nfs4_acls.c
+++ b/source3/modules/nfs4_acls.c
@@ -446,16 +446,16 @@ static int smbacl4_fill_ace4(
        memset(ace_v4, 0, sizeof(SMB_ACE4PROP_T));
        ace_v4->aceType = ace_nt->type; /* only ACCES|DENY supported right now */
        ace_v4->aceFlags = ace_nt->flags & SEC_ACE_FLAG_VALID_INHERIT;
-       ace_v4->aceMask = ace_nt->info.mask &
+       ace_v4->aceMask = ace_nt->access_mask &
                (STD_RIGHT_ALL_ACCESS | SA_RIGHT_FILE_ALL_ACCESS);
 
        if (ace_v4->aceFlags!=ace_nt->flags)
                DEBUG(9, ("ace_v4->aceFlags(0x%x)!=ace_nt->flags(0x%x)\n",
                        ace_v4->aceFlags, ace_nt->flags));
 
-       if (ace_v4->aceMask!=ace_nt->info.mask)
-               DEBUG(9, ("ace_v4->aceMask(0x%x)!=ace_nt->info.mask(0x%x)\n",
-                       ace_v4->aceMask, ace_nt->info.mask));
+       if (ace_v4->aceMask!=ace_nt->access_mask)
+               DEBUG(9, ("ace_v4->aceMask(0x%x)!=ace_nt->access_mask(0x%x)\n",
+                       ace_v4->aceMask, ace_nt->access_mask));
 
        if (sid_equal(&ace_nt->trustee, &global_sid_World)) {
                ace_v4->who.special_id = SMB_ACE4_WHO_EVERYONE;
@@ -557,7 +557,7 @@ static SMB4ACL_T *smbacl4_win2nfs4(
                BOOL    addNewACE = True;
 
                if (smbacl4_fill_ace4(mem_ctx, pparams, ownerUID, ownerGID,
-                       dacl->ace + i, &ace_v4))
+                       dacl->aces + i, &ace_v4))
                        return NULL;
 
                if (pparams->acedup!=e_dontcare) {