coredump,journal: do not do ACL magic for processes of dynamic UIDs

[thirdparty/systemd.git] / src / journal / journald-server.c

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 2f717687c0b2193c0b35e0f6bb6e5ce1a3ea11af..06c64a46e2ee4745435353cb20ce57fc3f699583 100644 (file)
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -248,7 +248,7 @@ static void server_add_acls(JournalFile *f, uid_t uid) {
         assert(f);
 
 #if HAVE_ACL
-        if (uid <= SYSTEM_UID_MAX)
+        if (uid_is_system(uid) || uid_is_dynamic(uid))
                 return;
 
         r = add_acls_for_user(f->fd, uid);
@@ -406,7 +406,7 @@ static JournalFile* find_journal(Server *s, uid_t uid) {
         if (s->runtime_journal)
                 return s->runtime_journal;
 
-        if (uid <= SYSTEM_UID_MAX || uid_is_dynamic(uid))
+        if (uid_is_system(uid) || uid_is_dynamic(uid))
                 return s->system_journal;
 
         r = sd_id128_get_machine(&machine);
@@ -955,7 +955,7 @@ void server_dispatch_message(
                         server_driver_message(s, c->pid,
                                               "MESSAGE_ID=" SD_MESSAGE_JOURNAL_DROPPED_STR,
                                               LOG_MESSAGE("Suppressed %i messages from %s", rl - 1, c->unit),
-                                              LOG_MESSAGE("N_DROPPED=%i", rl - 1),
+                                              "N_DROPPED=%i", rl - 1,
                                               NULL);
         }