diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-06-19 12:36:35 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-06-19 12:38:45 +0200 |
| commit | edc3797f7cd9e37c24e5241cac3263e7c918f732 (patch) | |
| tree | 789f94f81ffa82ccaacabfc857f1c774f4d88d3c /src/journal | |
| parent | 9eecdbc354c180885f10415b01fee126f3bb34aa (diff) | |
journald: make SplitMode=uid the default
Now that we actually can distuingish system and normal users there's no
point in taking session information into account anymore when splitting
up logs.
This has the beenfit with that coredump information will actually end up
in each user's own journal.
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/journald-server.c | 11 | ||||
| -rw-r--r-- | src/journal/journald-server.h | 2 | ||||
| -rw-r--r-- | src/journal/journald.conf | 2 |
3 files changed, 7 insertions, 8 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index 39a1a07ed..a4600e331 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -805,12 +805,11 @@ static void dispatch_message_real( /* Split up strictly by any UID */ journal_uid = realuid; else if (s->split_mode == SPLIT_LOGIN && realuid > 0 && owner_valid && owner > 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 to the - * user that is logged by a privileged process that is - * part of an unprivileged session.*/ + /* Split up by login UIDs. We do this only if the + * realuid is not root, in order not to accidentally + * leak privileged information to the user that is + * logged by a privileged process that is part of an + * unprivileged session.*/ journal_uid = owner; else journal_uid = 0; diff --git a/src/journal/journald-server.h b/src/journal/journald-server.h index e468b8293..42a2235ba 100644 --- a/src/journal/journald-server.h +++ b/src/journal/journald-server.h @@ -45,8 +45,8 @@ typedef enum Storage { } Storage; typedef enum SplitMode { - SPLIT_LOGIN, SPLIT_UID, + SPLIT_LOGIN, SPLIT_NONE, _SPLIT_MAX, _SPLIT_INVALID = -1 diff --git a/src/journal/journald.conf b/src/journal/journald.conf index d106d00b5..cded4a9d4 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -11,7 +11,7 @@ #Storage=auto #Compress=yes #Seal=yes -#SplitMode=login +#SplitMode=uid #SyncIntervalSec=5m #RateLimitInterval=30s #RateLimitBurst=1000 |