journal: split journal uid only when audit uid data is valid

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index c8a6285a84bba9660836f690cc34cc30834d0229..545760726e0d47cab0002e5463a2cff3c23b09de 100644 (file)
--- 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);
 }