From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 25 Jun 2026 07:43:13 +0000 (+0900)
Subject: journal: use recognizable error code
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c286c0daaf87a72c9d5769671b69349d87864b73;p=thirdparty%2Fsystemd.git

journal: use recognizable error code

EINVAL is too generic and widely used. Let's use more specific error code.
---

diff --git a/src/journal/journalctl-misc.c b/src/journal/journalctl-misc.c
index 78d3cae91ac..38bc03def37 100644
--- a/src/journal/journalctl-misc.c
+++ b/src/journal/journalctl-misc.c
@@ -56,7 +56,7 @@ int action_verify(void) {
 #endif
 
                 k = journal_file_verify(f, arg_verify_key, &first, &validated, &last, /* show_progress= */ !arg_quiet);
-                if (k == -EINVAL)
+                if (k == -EKEYREJECTED)
                         /* If the key was invalid give up right-away. */
                         return k;
                 if (k < 0)
diff --git a/src/libsystemd/sd-journal/journal-authenticate.c b/src/libsystemd/sd-journal/journal-authenticate.c
index 04fbe88b8cb..ff241fa0cb0 100644
--- a/src/libsystemd/sd-journal/journal-authenticate.c
+++ b/src/libsystemd/sd-journal/journal-authenticate.c
@@ -515,24 +515,24 @@ int journal_file_parse_verification_key(JournalFile *f, const char *key) {
 
                 x = unhexchar(*k);
                 if (x < 0)
-                        return -EINVAL;
+                        return -EKEYREJECTED;
                 k++;
 
                 y = unhexchar(*k);
                 if (y < 0)
-                        return -EINVAL;
+                        return -EKEYREJECTED;
                 k++;
 
                 seed[c] = (uint8_t) (x * 16 + y);
         }
 
         if (*k != '/')
-                return -EINVAL;
+                return -EKEYREJECTED;
         k++;
 
         r = sscanf(k, "%llx-%llx", &start, &interval);
         if (r != 2)
-                return -EINVAL;
+                return -EKEYREJECTED;
 
         f->fsprg_seed = IOVEC_MAKE(TAKE_PTR(seed), seed_size);
         f->fss_start_usec = start * interval;