sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

gpfs.so: map the file_inherit and dir_inherit flags away for files

Browse Source 
GPFS sets inherits dir_inhert and file_inherit flags
to files, too, which confuses windows, and seems to
be wrong anyways.

So when mapping a nfs4 acl to a windows acl, we map these
flags away for files.

Michael
This commit is contained in:
Michael Adam 2009-08-10 18:18:19 +02:00
parent 19553e1552
commit 12864ffd51
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source3/modules/nfs4_acls.c
View File

@ -226,6 +226,7 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
uint32_t mask; uint32_t mask;
DOM_SID sid; DOM_SID sid;
SMB_ACE4PROP_T *ace = &aceint->prop; SMB_ACE4PROP_T *ace = &aceint->prop;
uint32_t mapped_ace_flags;
DEBUG(10, ("magic: 0x%x, type: %d, iflags: %x, flags: %x, mask: %x, " DEBUG(10, ("magic: 0x%x, type: %d, iflags: %x, flags: %x, mask: %x, "
"who: %d\n", aceint->magic, ace->aceType, ace->flags, "who: %d\n", aceint->magic, ace->aceType, ace->flags,
@ -262,10 +263,23 @@ static bool smbacl4_nfs42win(TALLOC_CTX *mem_ctx, SMB4ACL_T *theacl, /* in */
ace->aceMask |= SMB_ACE4_DELETE_CHILD; ace->aceMask |= SMB_ACE4_DELETE_CHILD;
} }
mapped_ace_flags = ace->aceFlags & 0xf;
if (!is_directory && (mapped_ace_flags & 0x3)) {
/*
* GPFS sets inherits dir_inhert and file_inherit flags
* to files, too, which confuses windows, and seems to
* be wrong anyways. ==> Map these bits away for files.
*/
DEBUG(10, ("removing inherit flags from nfs4 ace\n"));
mapped_ace_flags &= ~0x3;
}
DEBUG(10, ("mapped ace flags: 0x%x => 0x%x\n",
ace->aceFlags, mapped_ace_flags));
mask = ace->aceMask; mask = ace->aceMask;
init_sec_ace(&nt_ace_list[good_aces++], &sid, init_sec_ace(&nt_ace_list[good_aces++], &sid,
ace->aceType, mask, ace->aceType, mask,
ace->aceFlags & 0xf); mapped_ace_flags);
} }
*ppnt_ace_list = nt_ace_list; *ppnt_ace_list = nt_ace_list;