]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
machine-credential: simplify code a bit
authorLennart Poettering <lennart@poettering.net>
Wed, 22 Nov 2023 10:55:46 +0000 (11:55 +0100)
committerLennart Poettering <lennart@poettering.net>
Wed, 22 Nov 2023 14:17:18 +0000 (15:17 +0100)
src/shared/machine-credential.c

index 992ac47c11f78b707863d8586c8910c0db10c832..7df36049777189b0ba23e167d4e2cba62bbd3140 100644 (file)
@@ -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();