security-and-privacy/gnupg
security-and-privacy
/
gnupg
mirror of git://git.gnupg.org/gnupg.git
1
0
Fork 0
Code Releases Activity

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.
This commit is contained in:
Werner Koch 2022-02-27 12:23:05 +01:00
parent 7c8c606061
commit f03c871c9e
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
agent/call-daemon.c
View File

@ -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]);