mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-20 14:37:08 +01:00
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:
parent
7c8c606061
commit
f03c871c9e
@ -113,7 +113,7 @@ wait_child_thread (void *arg)
|
|||||||
#ifndef HAVE_W32_SYSTEM
|
#ifndef HAVE_W32_SYSTEM
|
||||||
int wstatus;
|
int wstatus;
|
||||||
#endif
|
#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_global_s *g = &daemon_global[type];
|
||||||
struct daemon_local_s *sl;
|
struct daemon_local_s *sl;
|
||||||
|
|
||||||
@ -384,6 +384,7 @@ daemon_start (enum daemon_type type, ctrl_t ctrl)
|
|||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/* If the daemon program has not been specified switch to the standard. */
|
||||||
if (!opt.daemon_program[type] || !*opt.daemon_program[type])
|
if (!opt.daemon_program[type] || !*opt.daemon_program[type])
|
||||||
opt.daemon_program[type] = gnupg_module_name (daemon_modules[type]);
|
opt.daemon_program[type] = gnupg_module_name (daemon_modules[type]);
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user