mirror of
https://github.com/systemd/systemd.git
synced 2024-10-28 03:25:31 +03:00
journald: don't recalculate the ACL mask
Otherwise we might end up with executable files if some default ACL is set for the journal directory.
This commit is contained in:
parent
b00ad20fa0
commit
11ec7cede5
@ -227,9 +227,9 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* We do not recalculate the mask here, so that the fchmod() mask above stays intact. */
|
||||||
if (acl_get_permset(entry, &permset) < 0 ||
|
if (acl_get_permset(entry, &permset) < 0 ||
|
||||||
acl_add_perm(permset, ACL_READ) < 0 ||
|
acl_add_perm(permset, ACL_READ) < 0) {
|
||||||
acl_calc_mask(&acl) < 0) {
|
|
||||||
log_warning("Failed to patch ACL on %s, ignoring: %m", f->path);
|
log_warning("Failed to patch ACL on %s, ignoring: %m", f->path);
|
||||||
goto finish;
|
goto finish;
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user