From f03c871c9e407d2aeff7b971f67a68b929f17b99 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Sun, 27 Feb 2022 12:23:05 +0100 Subject: [PATCH] agent: Print the correct daemon name in presence of a --foo-program. * agent/call-daemon.c (wait_child_thread): Print the correct name. -- This makes sure that the log print the actual used name if for example --pinentry-program was used. --- agent/call-daemon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/agent/call-daemon.c b/agent/call-daemon.c index 3bf6bb793..26c25fcd9 100644 --- a/agent/call-daemon.c +++ b/agent/call-daemon.c @@ -113,7 +113,7 @@ wait_child_thread (void *arg) #ifndef HAVE_W32_SYSTEM int wstatus; #endif - const char *name = gnupg_module_name (daemon_modules[type]); + const char *name = opt.daemon_program[type]; struct daemon_global_s *g = &daemon_global[type]; struct daemon_local_s *sl; @@ -384,6 +384,7 @@ daemon_start (enum daemon_type type, ctrl_t ctrl) #endif } + /* If the daemon program has not been specified switch to the standard. */ if (!opt.daemon_program[type] || !*opt.daemon_program[type]) opt.daemon_program[type] = gnupg_module_name (daemon_modules[type]);