From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 13 Oct 2015 06:04:11 +0000 (+0300)
Subject: journalctl: enable args for --dump-catalog and --list-catalog
X-Git-Tag: v228~212^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1548%2Fhead;p=thirdparty%2Fsystemd.git

journalctl: enable args for --dump-catalog and --list-catalog

`journalctl --dump-catalog ID1 ID2 ...` works fine.
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index 3cc5b1e7025..e163e3d4173 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -748,7 +748,7 @@ static int parse_argv(int argc, char *argv[]) {
                 return -EINVAL;
         }
 
-        if (arg_action != ACTION_SHOW && optind < argc) {
+        if (!IN_SET(arg_action, ACTION_SHOW, ACTION_DUMP_CATALOG, ACTION_LIST_CATALOG) && optind < argc) {
                 log_error("Extraneous arguments starting with '%s'", argv[optind]);
                 return -EINVAL;
         }