diff options
| author | Alexander Bokovoy <ab@samba.org> | 2007-02-20 15:56:32 +0000 |
|---|---|---|
| committer | Alexander Bokovoy <ab@samba.org> | 2007-02-20 15:56:32 +0000 |
| commit | 4f8e366326cd6b04da0dc85e7fc1b42432a89322 (patch) | |
| tree | 187a8f6e0be6644b10d1709a750c980c4899f03b | |
| parent | 2b0d5a43f2d79440f44ff0e0cce6b6473bf1c8cd (diff) | |
| download | samba-4f8e366326cd6b04da0dc85e7fc1b42432a89322.tar.gz samba-4f8e366326cd6b04da0dc85e7fc1b42432a89322.tar.xz samba-4f8e366326cd6b04da0dc85e7fc1b42432a89322.zip | |
r21469: Fix nfs4_acls module to follow 3.0.25 deviation in SEC_ACE and SEC_ACL definitions
| -rw-r--r-- | source/modules/nfs4_acls.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/source/modules/nfs4_acls.c b/source/modules/nfs4_acls.c index c4f2b977320..91ebba1f588 100644 --- a/source/modules/nfs4_acls.c +++ b/source/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) + 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 @@ 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) { |