From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 22 Nov 2023 10:55:46 +0000 (+0100)
Subject: machine-credential: simplify code a bit
X-Git-Tag: v255-rc3~8^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1311946233c72ce6e9d555a6b365c5b2e5268585;p=thirdparty%2Fsystemd.git

machine-credential: simplify code a bit
---

diff --git a/src/shared/machine-credential.c b/src/shared/machine-credential.c
index 992ac47c11f..7df36049777 100644
--- a/src/shared/machine-credential.c
+++ b/src/shared/machine-credential.c
@@ -102,14 +102,16 @@ int machine_credential_load(MachineCredential **credentials, size_t *n_credentia
                 j = path_join(e, p);
                 if (!j)
                         return log_oom();
+
+                p = j;
         }
 
-        r = read_full_file_full(AT_FDCWD, j ?: p, UINT64_MAX, SIZE_MAX,
+        r = read_full_file_full(AT_FDCWD, p, UINT64_MAX, SIZE_MAX,
                                 flags,
                                 NULL,
                                 &data, &size);
         if (r < 0)
-                return log_error_errno(r, "Failed to read credential '%s': %m", j ?: p);
+                return log_error_errno(r, "Failed to read credential '%s': %m", p);
 
         if (!GREEDY_REALLOC(*credentials, *n_credentials + 1))
                 return log_oom();