SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

journald: be a bit more careful when spitting up journals by user id

Browse Source
This commit is contained in:
Lennart Poettering
2013-03-05 14:27:34 +01:00
parent 8a0889dfda
commit 40adcda869
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/journal/journald-server.c
+11 -2
View File
@@ -670,10 +670,19 @@ static void dispatch_message_real(
assert(n <= m);
if (s->split_mode == SPLIT_UID && realuid > 0)
/* Split up strictly by any UID */
journal_uid = realuid;
else if (s->split_mode == SPLIT_LOGIN && owner_valid && owner > 0)
else if (s->split_mode == SPLIT_LOGIN && owner_valid && owner > 0 && realuid > 0)
/* Split up by login UIDs, this avoids creation of
* individual journals for system UIDs. We do this
* only if the realuid is not root, in order not to
* accidentally leak privileged information logged by
* a privileged process that is part of an
* unprivileged session to the user. */
journal_uid = owner;
else if (s->split_mode == SPLIT_LOGIN && loginuid_valid && loginuid > 0)
else if (s->split_mode == SPLIT_LOGIN && loginuid_valid && loginuid > 0 && realuid > 0)
/* Hmm, let's try via the audit uids, as fallback,
* just in case */
journal_uid = loginuid;
else
journal_uid = 0;