mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-02 12:01:32 +01:00
2009-11-27 Marcus Brinkmann <marcus@g10code.de>
* command.c (start_command_handler): Do not call assuan_set_log_stream anymore. * gpg-agent.c (main): But call assuan_set_assuan_log_stream here.
This commit is contained in:
parent
18bdcc0881
commit
e1172f00be
@ -1,3 +1,9 @@
|
||||
2009-11-27 Marcus Brinkmann <marcus@g10code.de>
|
||||
|
||||
* command.c (start_command_handler): Do not call
|
||||
assuan_set_log_stream anymore.
|
||||
* gpg-agent.c (main): But call assuan_set_assuan_log_stream here.
|
||||
|
||||
2009-11-25 Marcus Brinkmann <marcus@g10code.de>
|
||||
|
||||
* command.c (start_command_handler): Use assuan_fd_t and
|
||||
|
@ -1953,9 +1953,6 @@ start_command_handler (ctrl_t ctrl, gnupg_fd_t listen_fd, gnupg_fd_t fd)
|
||||
ctrl->server_local->use_cache_for_signing = 1;
|
||||
ctrl->digest.raw_value = 0;
|
||||
|
||||
if (DBG_ASSUAN)
|
||||
assuan_set_log_stream (ctx, log_get_stream ());
|
||||
|
||||
assuan_set_io_monitor (ctx, io_monitor, NULL);
|
||||
|
||||
for (;;)
|
||||
|
@ -472,6 +472,8 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread)
|
||||
|| strcmp (current_logfile, pargs->r.ret_str))
|
||||
{
|
||||
log_set_file (pargs->r.ret_str);
|
||||
if (DBG_ASSUAN)
|
||||
assuan_set_assuan_log_stream (log_get_stream ());
|
||||
xfree (current_logfile);
|
||||
current_logfile = xtrystrdup (pargs->r.ret_str);
|
||||
}
|
||||
@ -922,6 +924,8 @@ main (int argc, char **argv )
|
||||
|JNLIB_LOG_WITH_PID));
|
||||
current_logfile = xstrdup (logfile);
|
||||
}
|
||||
if (DBG_ASSUAN)
|
||||
assuan_set_assuan_log_stream (log_get_stream ());
|
||||
|
||||
/* Make sure that we have a default ttyname. */
|
||||
if (!default_ttyname && ttyname (1))
|
||||
|
Loading…
x
Reference in New Issue
Block a user