morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

core/import-creds: use RET_GATHER

Browse Source
This commit is contained in:
Mike Yuan
2024-09-11 17:21:30 +02:00
parent 61e018dfad
commit 63edae360f
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/core/import-creds.c
View File

@@ -705,28 +705,26 @@ static int import_credentials_trusted(void) {
_cleanup_(import_credentials_context_done) ImportCredentialsContext c = {
.target_dir_fd = -EBADF,
};
int q, w, r, y;
int r, ret = 0;
/* This is invoked during early boot when no credentials have been imported so far. (Specifically, if
* the $CREDENTIALS_DIRECTORY or $ENCRYPTED_CREDENTIALS_DIRECTORY environment variables are not set
* yet.) */
r = import_credentials_qemu(&c);
w = import_credentials_smbios(&c);
q = import_credentials_proc_cmdline(&c);
y = import_credentials_initrd(&c);
RET_GATHER(ret, import_credentials_qemu(&c));
RET_GATHER(ret, import_credentials_smbios(&c));
RET_GATHER(ret, import_credentials_proc_cmdline(&c));
RET_GATHER(ret, import_credentials_initrd(&c));
if (c.n_credentials > 0) {
int z;
log_debug("Imported %u credentials from kernel command line/smbios/fw_cfg/initrd.", c.n_credentials);
z = finalize_credentials_dir(SYSTEM_CREDENTIALS_DIRECTORY, "CREDENTIALS_DIRECTORY");
if (z < 0)
return z;
r = finalize_credentials_dir(SYSTEM_CREDENTIALS_DIRECTORY, "CREDENTIALS_DIRECTORY");
if (r < 0)
return r;
}
return r < 0 ? r : w < 0 ? w : q < 0 ? q : y;
return ret;
}
static int merge_credentials_trusted(const char *creds_dir) {