commit a2abd3b67def3d488c59d68ec430f857e8f441a7
author Ross Lagerwall <ross.lagerwall@citrix.com> Thu Oct 27 16:30:11 2022 +0100
committer Stefan Berger <stefanb@us.ibm.com> Tue Nov 01 18:01:47 2022 -0400
tree 423c5aa4012154745e3ab049b54ce3996898f1ba
parent 66117eefa8e97c9cbd6b951e72a86425eb2947e6

swtpm_setup: Configure swtpm to log to stdout/err if needed

If swtpm_setup is configured with a log file, it launches swtpm
configured with the same log file. If not, swtpm_setup logs will go to
stdout/stderr and it should configure swtpm to do the same.

Signed-off-by: Ross Lagerwall <ross.lagerwall@citrix.com>

src/swtpm_setup/swtpm.c

diff --git a/src/swtpm_setup/swtpm.c b/src/swtpm_setup/swtpm.c
index 77871d7..2643ee2 100644
--- a/src/swtpm_setup/swtpm.c
+++ b/src/swtpm_setup/swtpm.c
@@ -66,6 +66,7 @@
     struct stat statbuf;
     gboolean success;
     GError *error = NULL;
+    GSpawnFlags flags;
     unsigned ctr;
     int pidfile_fd;
     int ret = 1;
@@ -128,8 +129,16 @@
     }
 #endif
 
-    success = g_spawn_async(NULL, argv, NULL,
-                            G_SPAWN_LEAVE_DESCRIPTORS_OPEN | G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL,
+    flags = G_SPAWN_LEAVE_DESCRIPTORS_OPEN;
+    if (gl_LOGFILE) {
+        flags |= G_SPAWN_STDOUT_TO_DEV_NULL | G_SPAWN_STDERR_TO_DEV_NULL;
+    } else {
+#if GLIB_CHECK_VERSION(2, 74, 0)
+        flags |= G_SPAWN_CHILD_INHERITS_STDOUT | G_SPAWN_CHILD_INHERITS_STDERR;
+#endif
+    }
+
+    success = g_spawn_async(NULL, argv, NULL, flags,
                             NULL, NULL, &self->pid, &error);
     if (!success) {
         logerr(self->logfile, "Could not start swtpm: %s\n", error->message);