sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-25 23:21:54 +03:00
Code

This covers a case where an ID_TYPE_BOTH mapping creates group permissions, but must own the file. Based on an original patch by Andrew Bartlett.

Browse Source
This commit is contained in:
Jeremy Allison 2012-05-14 12:34:39 -07:00 committed by Andrew Bartlett
parent 59106473d3
commit 173f818a29
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source3/smbd/posix_acls.c
View File

@ -1420,7 +1420,8 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
if (setting_acl) {
/* See if the owning user is in any of the other groups in
the ACE, or if there's a matching user entry.
the ACE, or if there's a matching user entry (by uid
or in the case of ID_TYPE_BOTH by SID).
If so, OR in the permissions from that entry. */
canon_ace *pace_iter;
@ -1430,7 +1431,9 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
pace_iter->unix_ug.uid == pace->unix_ug.uid) {
pace->perms |= pace_iter->perms;
} else if (pace_iter->type == SMB_ACL_GROUP_OBJ || pace_iter->type == SMB_ACL_GROUP) {
if (uid_entry_in_group(conn, pace, pace_iter)) {
if (dom_sid_equal(&pace->trustee, &pace_iter->trustee)) {
pace->perms |= pace_iter->perms;
} else if (uid_entry_in_group(conn, pace, pace_iter)) {
pace->perms |= pace_iter->perms;
}
}