From da4993920cdf5527b8528f0a483b54ab3cbc1971 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Mon, 4 Mar 2013 15:17:45 +0100 Subject: [PATCH] journal: split journal uid only when audit uid data is valid --- src/journal/journald-server.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c index c8a6285a8..545760726 100644 --- a/src/journal/journald-server.c +++ b/src/journal/journald-server.c @@ -671,12 +671,12 @@ static void dispatch_message_real( assert(n <= m); - if (s->split_mode == SPLIT_NONE) - journal_uid = 0; - else if (s->split_mode == SPLIT_UID || realuid == 0 || !loginuid_valid) + if (s->split_mode == SPLIT_UID && realuid > 0) journal_uid = realuid; - else + else if (s->split_mode == SPLIT_LOGIN && loginuid > 0 && loginuid_valid) journal_uid = loginuid; + else + journal_uid = 0; write_to_journal(s, journal_uid, iovec, n); } -- 2.30.2