svn commit: samba r18785 - in branches/SAMBA_3_0/source/modules: .

[vlendec at samba.org]

Author: vlendec
Date: 2006-09-21 14:17:00 +0000 (Thu, 21 Sep 2006)
New Revision: 18785

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18785

Log:
Check in Peter Somogyis build fix
Modified:
   branches/SAMBA_3_0/source/modules/nfs4_acls.c


Changeset:
Modified: branches/SAMBA_3_0/source/modules/nfs4_acls.c
===================================================================
--- branches/SAMBA_3_0/source/modules/nfs4_acls.c	2006-09-21 08:48:18 UTC (rev 18784)
+++ branches/SAMBA_3_0/source/modules/nfs4_acls.c	2006-09-21 14:17:00 UTC (rev 18785)
@@ -446,16 +446,16 @@
 	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 @@
 		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) {