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

Part 5 of bugfix for bug #7509 - smb_acl_to_posix: ACL is invalid for set (Invalid argument)

Browse Source 
Be smarter about setting default permissions when a ACL_GROUP_OBJ isn't given. Use the
principle of least surprises for the user.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Sat Sep  3 00:16:05 CEST 2011 on sn-devel-104
This commit is contained in:
Jeremy Allison 2011-09-02 13:41:24 -07:00
parent 2a1453e231
commit 17f6e02723
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source3/smbd/posix_acls.c
View File

@ -1457,12 +1457,29 @@ static bool ensure_canon_entry_valid(connection_struct *conn, canon_ace **pp_ace
pace->unix_ug.uid = pst->st_ex_gid;
pace->trustee = *pfile_grp_sid;
pace->attr = ALLOW_ACE;
/* Start with existing permissions, principle of least
surprises for the user. */
pace->perms = pst->st_ex_mode;
if (setting_acl) {
/* See if there's a matching group entry.
If so, OR in the permissions from that entry. */
canon_ace *pace_iter;
for (pace_iter = *pp_ace; pace_iter; pace_iter = pace_iter->next) {
if (pace_iter->type == SMB_ACL_GROUP &&
pace_iter->unix_ug.gid == pace->unix_ug.gid) {
pace->perms |= pace_iter->perms;
break;
}
}
/* If we only got an "everyone" perm, just use that. */
if (got_other)
pace->perms = pace_other->perms;
else
pace->perms = 0;
if (pace->perms == 0) {
if (got_other)
pace->perms = pace_other->perms;
}
apply_default_perms(params, is_directory, pace, S_IRGRP);
} else {
pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IRGRP, S_IWGRP, S_IXGRP);