svn commit: samba r21469 - in branches/SAMBA_3_0_25/source/modules:
.
ab at samba.org
ab at samba.org
Tue Feb 20 15:56:32 GMT 2007
Author: ab
Date: 2007-02-20 15:56:32 +0000 (Tue, 20 Feb 2007)
New Revision: 21469
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=21469
Log:
Fix nfs4_acls module to follow 3.0.25 deviation in SEC_ACE and SEC_ACL definitions
Modified:
branches/SAMBA_3_0_25/source/modules/nfs4_acls.c
Changeset:
Modified: branches/SAMBA_3_0_25/source/modules/nfs4_acls.c
===================================================================
--- branches/SAMBA_3_0_25/source/modules/nfs4_acls.c 2007-02-20 15:55:44 UTC (rev 21468)
+++ branches/SAMBA_3_0_25/source/modules/nfs4_acls.c 2007-02-20 15:56:32 UTC (rev 21469)
@@ -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)
+ 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->info.mask));
+ 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) {
More information about the samba-cvs
mailing list