From: Frantisek Sumsal <frantisek@sumsal.cz>
Date: Mon, 18 Dec 2023 16:06:43 +0000 (+0100)
Subject: journalctl: also refuse --cursor-file= with --since=
X-Git-Tag: v256-rc1~1462^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=159d1e2659d19de5f61dca14a52be7a9cceac078;p=thirdparty%2Fsystemd.git

journalctl: also refuse --cursor-file= with --since=

We already refuse the other two cursor-related options (--cursor= and
--after-cursor=) with --since=, so let's do the same with
--cursor-file=.

Closes: #20523
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index de1534befd2..fe68ec4310b 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1088,9 +1088,9 @@ static int parse_argv(int argc, char *argv[]) {
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "--since= must be before --until=.");
 
-        if (!!arg_cursor + !!arg_after_cursor + !!arg_since_set > 1)
+        if (!!arg_cursor + !!arg_after_cursor + !!arg_cursor_file + !!arg_since_set > 1)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
-                                       "Please specify only one of --since=, --cursor=, and --after-cursor=.");
+                                       "Please specify only one of --since=, --cursor=, --cursor-file=, and --after-cursor=.");
 
         if (arg_follow && arg_reverse)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),