From 30b97055a5c7d81019a6c21bb63d9c033d4b8004 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 26 Mar 2026 16:32:48 +0100 Subject: [PATCH] varlink: tweak exec_with_listen_fds() log generation The previous code used strv_join() when it generated the log message for `varlinkctl --exec`. However this can lead to inaccurate logging so use `quote_command_line()` instead. Thanks to Lennart for suggesting this. --- src/varlinkctl/varlinkctl.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/varlinkctl/varlinkctl.c b/src/varlinkctl/varlinkctl.c index 979797f8ecd..4495d090dfc 100644 --- a/src/varlinkctl/varlinkctl.c +++ b/src/varlinkctl/varlinkctl.c @@ -12,6 +12,7 @@ #include "bus-util.h" #include "chase.h" #include "env-util.h" +#include "escape.h" #include "fd-util.h" #include "fileio.h" #include "format-table.h" @@ -653,7 +654,7 @@ static int upgrade_forward_done(SocketForward *sf, int error, void *userdata) { _noreturn_ static void exec_with_listen_fds(char **exec_cmdline, int *fds, size_t n_fds) { int r; - _cleanup_free_ char *j = strv_join(exec_cmdline, " "); + _cleanup_free_ char *j = quote_command_line(exec_cmdline, SHELL_ESCAPE_EMPTY); if (!j) { log_oom(); _exit(EXIT_FAILURE); -- 2.47.3