From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Fri, 6 Dec 2024 10:11:24 +0000 (+0100)
Subject: Revert "journalctl: show coredumps again when --unit= is specified"
X-Git-Tag: v257~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=560412148fa62d779ea522d43960dd3acd44b261;p=thirdparty%2Fsystemd.git

Revert "journalctl: show coredumps again when --unit= is specified"

This reverts commit cbd5f5d7d6d652d52a18170123f5d08baf7e9862.
---

diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 95af913a5ad..0b28ce41173 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -1653,6 +1653,7 @@ int add_matches_for_unit_full(sd_journal *j, bool all, const char *unit) {
                         /* Look for coredumps of the service */
                         (r = sd_journal_add_disjunction(j)) ||
                         (r = sd_journal_add_match(j, "MESSAGE_ID=" SD_MESSAGE_COREDUMP_STR, SIZE_MAX)) ||
+                        (r = sd_journal_add_match(j, "_UID=0", SIZE_MAX)) ||
                         (r = journal_add_match_pair(j, "COREDUMP_UNIT", unit))
                 );
 
@@ -1695,7 +1696,8 @@ int add_matches_for_user_unit_full(sd_journal *j, bool all, const char *unit) {
                         /* Look for coredumps of the service */
                         (r = sd_journal_add_disjunction(j)) ||
                         (r = journal_add_match_pair(j, "COREDUMP_USER_UNIT", unit)) ||
-                        (r = journal_add_matchf(j, "_UID="UID_FMT, uid))
+                        (r = journal_add_matchf(j, "_UID="UID_FMT, uid)) ||
+                        (r = sd_journal_add_match(j, "_UID=0", SIZE_MAX))
                 );
 
         if (r == 0 && all && endswith(unit, ".slice"))