sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-01 04:58:35 +03:00
Code

Make the posix ACL module cope with a NULL incoming DACL and a

Browse Source 
missing owner/group.

Jeremy.
This commit is contained in:
Jeremy Allison 2010-10-11 17:07:54 -07:00
parent 44a4b677fe
commit 71d9f51b4e
1 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
source3/smbd/posix_acls.c
View File

@ -3862,6 +3862,29 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, const struct s
return NT_STATUS_NO_MEMORY;
}
if((security_info_sent & SECINFO_DACL) &&
(psd->type & SEC_DESC_DACL_PRESENT) &&
(psd->dacl == NULL)) {
struct security_ace ace;
/* We can't have NULL DACL in POSIX.
Use Everyone -> full access. */
init_sec_ace(&ace,
&global_sid_World,
SEC_ACE_TYPE_ACCESS_ALLOWED,
GENERIC_ALL_ACCESS,
0);
psd->dacl = make_sec_acl(talloc_tos(),
NT4_ACL_REVISION,
1,
&ace);
if (psd->dacl == NULL) {
return NT_STATUS_NO_MEMORY;
}
security_acl_map_generic(psd->dacl, &file_generic_mapping);
}
/*
* Get the current state of the file.
*/
@ -3878,6 +3901,14 @@ NTSTATUS set_nt_acl(files_struct *fsp, uint32 security_info_sent, const struct s
* Unpack the user/group/world id's.
*/
/* POSIX can't cope with missing owner/group. */
if ((security_info_sent & SECINFO_OWNER) && (psd->owner_sid == NULL)) {
security_info_sent &= ~SECINFO_OWNER;
}
if ((security_info_sent & SECINFO_GROUP) && (psd->group_sid == NULL)) {
security_info_sent &= ~SECINFO_GROUP;
}
status = unpack_nt_owners( conn, &user, &grp, security_info_sent, psd);
if (!NT_STATUS_IS_OK(status)) {
return status;