Proxmox-Port/swtpm
1
0
Fork 0
mirror of https://github.com/stefanberger/swtpm.git synced 2026-02-05 22:54:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

swtpm_setup: Report stderr as returned by external tool (swtpm-localcal)

Browse Source 
Report the error printed out via stderr as returned by swtpm-localca for
example.

Signed-off-by: Stefan Berger <stefanb@linux.ibm.com>
This commit is contained in:
Stefan Berger 2021-10-19 07:10:44 -04:00 committed by Stefan Berger
parent 4c178928dc
commit c40fceb3ca
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/swtpm_setup/swtpm_setup.c
View File

@ -246,6 +246,7 @@ static int call_create_certs(unsigned long flags, const gchar *configfile, const
for (idx = 0; flags_to_certfiles[idx].filename != NULL; idx++) {
if (flags & flags_to_certfiles[idx].flag) {
g_autofree gchar *standard_output = NULL;
g_autofree gchar *standard_error = NULL;
GError *error = NULL;
gchar **lines;
@ -255,8 +256,8 @@ static int call_create_certs(unsigned long flags, const gchar *configfile, const
logit(gl_LOGFILE, " Invoking %s\n", s);
g_free(s);
success = g_spawn_sync(NULL, cmd, NULL, G_SPAWN_STDERR_TO_DEV_NULL, NULL, NULL,
&standard_output, NULL, &exit_status, &error);
success = g_spawn_sync(NULL, cmd, NULL, 0, NULL, NULL,
&standard_output, &standard_error, &exit_status, &error);
if (!success) {
logerr(gl_LOGFILE, "An error occurred running %s: %s\n",
create_certs_tool, error->message);
@ -265,7 +266,7 @@ static int call_create_certs(unsigned long flags, const gchar *configfile, const
break;
} else if (exit_status != 0) {
logerr(gl_LOGFILE, "%s exit with status %d: %s\n",
prgname, exit_status, standard_output);
prgname, WEXITSTATUS(exit_status), standard_error);
ret = 1;
break;
}
@ -279,6 +280,8 @@ static int call_create_certs(unsigned long flags, const gchar *configfile, const
g_free(standard_output);
standard_output = NULL;
g_free(standard_error);
standard_error = NULL;
}
}
}