diff options
| author | Jeremy Allison <jra@samba.org> | 2012-11-08 13:45:19 -0800 |
|---|---|---|
| committer | Karolin Seeger <kseeger@samba.org> | 2012-12-06 09:40:19 +0100 |
| commit | 692b817ffcc3b03a87e1e66c78b38f3dc67084f3 (patch) | |
| tree | 30d1e421f0d7c55456176c834e8448c1d103526a | |
| parent | 92280d202e0708c5ba394456a7d739c242a750f6 (diff) | |
| download | samba-692b817ffcc3b03a87e1e66c78b38f3dc67084f3.tar.gz | |
Another fix needed for bug #9236 - ACL masks incorrectly applied when setting ACLs.
Not caught by make test as it's an extreme edge case for strange
incoming ACLs. I only found this as I'm making raw.acls and smb2.acls
pass against 3.6.x with acl_xattr mapped onto a POSIX backend (which
isn't tested in make test).
An incoming inheritable ACE entry containing only one permission,
WRITE_DATA maps into a POSIX owner perm of "-w-", which violates
the principle that the owner of a file/directory can always read.
(cherry picked from commit e2eb914cb986e28e412863553010795bff8ac3e1)
| -rw-r--r-- | source3/smbd/posix_acls.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/source3/smbd/posix_acls.c b/source3/smbd/posix_acls.c index 22ad40faec0..8d6e7ecea48 100644 --- a/source3/smbd/posix_acls.c +++ b/source3/smbd/posix_acls.c @@ -1372,7 +1372,11 @@ static bool ensure_canon_entry_valid(connection_struct *conn, for (pace = *pp_ace; pace; pace = pace->next) { if (pace->type == SMB_ACL_USER_OBJ) { - if (setting_acl && !is_default_acl) { + if (setting_acl) { + /* + * Ensure we have default parameters for the + * user (owner) even on default ACLs. + */ apply_default_perms(params, is_directory, pace, S_IRUSR); } got_user = True; @@ -1452,9 +1456,11 @@ static bool ensure_canon_entry_valid(connection_struct *conn, pace->perms = pace_other->perms; } - if (!is_default_acl) { - apply_default_perms(params, is_directory, pace, S_IRUSR); - } + /* + * Ensure we have default parameters for the + * user (owner) even on default ACLs. + */ + apply_default_perms(params, is_directory, pace, S_IRUSR); } else { pace->perms = unix_perms_to_acl_perms(pst->st_ex_mode, S_IRUSR, S_IWUSR, S_IXUSR); } |