From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 21 Mar 2024 18:09:35 +0000 (+0900)
Subject: journalctl-filter: add missing sd_journal_add_conjunction()
X-Git-Tag: v256-rc1~382^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bb59f34c210b58471a4b3794fd63bb1373f80511;p=thirdparty%2Fsystemd.git

journalctl-filter: add missing sd_journal_add_conjunction()

Otherwise, if --facility= is specified with extra matches with '+',
the facility filter will not be applied to the specified filter after '+'.
---

diff --git a/src/journal/journalctl-filter.c b/src/journal/journalctl-filter.c
index 1223eeec02f..f013c42470a 100644
--- a/src/journal/journalctl-filter.c
+++ b/src/journal/journalctl-filter.c
@@ -311,7 +311,7 @@ static int add_facilities(sd_journal *j) {
                         return r;
         }
 
-        return 0;
+        return sd_journal_add_conjunction(j);
 }
 
 static int add_matches_for_device(sd_journal *j, const char *devpath) {