aboutsummaryrefslogtreecommitdiffstats
path: root/agent/call-daemon.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2022-02-27 11:23:05 +0000
committerWerner Koch <[email protected]>2022-02-27 11:26:39 +0000
commitf03c871c9e407d2aeff7b971f67a68b929f17b99 (patch)
treee664e0160897efd96fb61873dd7e9ce4d05c1d79 /agent/call-daemon.c
parentagent: New flag "qual" for the trustlist.txt. (diff)
downloadgnupg-f03c871c9e407d2aeff7b971f67a68b929f17b99.tar.gz
gnupg-f03c871c9e407d2aeff7b971f67a68b929f17b99.zip
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.
Diffstat (limited to 'agent/call-daemon.c')
-rw-r--r--agent/call-daemon.c3
1 files changed, 2 insertions, 1 deletions
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]);