evin/ms-nfs41-client
3
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[bakeathon] [acl] fixing inheritance flags

Browse source 
windows inherite directory flag was translated to file inherite flag

cosmetic: print ace type
This commit is contained in:
Olga Kornievskaia 2011-10-24 12:09:49 -04:00
parent 7485d53f64
commit 861941944f
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
daemon/acl.c
View file

@ -227,7 +227,8 @@ static int convert_nfs4acl_2_dacl(nfsacl41 *acl, int file_type,
for (i = 0; i < acl->count; i++) { for (i = 0; i < acl->count; i++) {
// nfs4 acemask should be exactly the same as file access mask // nfs4 acemask should be exactly the same as file access mask
mask = acl->aces[i].acemask; mask = acl->aces[i].acemask;
dprintf(1, "access mask %x\n", mask); dprintf(1, "access mask %x ace type %s\n", mask,
acl->aces[i].acetype?"DENIED ACE":"ALLOWED ACE");
if (acl->aces[i].acetype == ACE4_ACCESS_ALLOWED_ACE_TYPE) { if (acl->aces[i].acetype == ACE4_ACCESS_ALLOWED_ACE_TYPE) {
status = AddAccessAllowedAce(dacl, ACL_REVISION, mask, sids[i]); status = AddAccessAllowedAce(dacl, ACL_REVISION, mask, sids[i]);
if (!status) { if (!status) {
@ -497,7 +498,7 @@ static void map_aceflags(BYTE win_aceflags, uint32_t *nfs4_aceflags)
if (win_aceflags & OBJECT_INHERIT_ACE) if (win_aceflags & OBJECT_INHERIT_ACE)
*nfs4_aceflags |= ACE4_FILE_INHERIT_ACE; *nfs4_aceflags |= ACE4_FILE_INHERIT_ACE;
if (win_aceflags & CONTAINER_INHERIT_ACE) if (win_aceflags & CONTAINER_INHERIT_ACE)
*nfs4_aceflags |= ACE4_FILE_INHERIT_ACE; *nfs4_aceflags |= ACE4_DIRECTORY_INHERIT_ACE;
if (win_aceflags & NO_PROPAGATE_INHERIT_ACE) if (win_aceflags & NO_PROPAGATE_INHERIT_ACE)
*nfs4_aceflags |= ACE4_NO_PROPAGATE_INHERIT_ACE; *nfs4_aceflags |= ACE4_NO_PROPAGATE_INHERIT_ACE;
if (win_aceflags & INHERIT_ONLY_ACE) if (win_aceflags & INHERIT_ONLY_ACE)