diff options
| author | Volker Lendecke <vlendec@samba.org> | 2006-09-21 14:17:00 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:00:57 -0500 |
| commit | b3d18b12c23670b02f4f98e1afeb32f829050fb3 (patch) | |
| tree | ba0a6d6f74cd933a05002d5a382c69040515ef60 | |
| parent | beecb90440af7cb59e31ffc708fdb7ad53932b6b (diff) | |
| download | samba-b3d18b12c23670b02f4f98e1afeb32f829050fb3.tar.gz samba-b3d18b12c23670b02f4f98e1afeb32f829050fb3.tar.bz2 samba-b3d18b12c23670b02f4f98e1afeb32f829050fb3.zip | |
r18785: Check in Peter Somogyis build fix
(This used to be commit 31c1be90565b2d2d111dddb7f0563fa8c303852b)
| -rw-r--r-- | source3/modules/nfs4_acls.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/source3/modules/nfs4_acls.c b/source3/modules/nfs4_acls.c index caa2f9503c..91ebba1f58 100644 --- 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) { |