diff options
| author | Marcus Brinkmann <[email protected]> | 2009-11-27 19:13:02 +0000 |
|---|---|---|
| committer | Marcus Brinkmann <[email protected]> | 2009-11-27 19:13:02 +0000 |
| commit | e1172f00be009e025d4b25d7ad8f9bb2ec22c17b (patch) | |
| tree | 671ffbfcfbbb7a313130f53e045e948eac10b9fd | |
| parent | agent/ (diff) | |
| download | gnupg-e1172f00be009e025d4b25d7ad8f9bb2ec22c17b.tar.gz gnupg-e1172f00be009e025d4b25d7ad8f9bb2ec22c17b.zip | |
2009-11-27 Marcus Brinkmann <[email protected]>
* 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.
| -rw-r--r-- | agent/ChangeLog | 6 | ||||
| -rw-r--r-- | agent/command.c | 3 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 4 |
3 files changed, 10 insertions, 3 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 3bb232219..25034d89c 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,9 @@ +2009-11-27 Marcus Brinkmann <[email protected]> + + * 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 <[email protected]> * command.c (start_command_handler): Use assuan_fd_t and diff --git a/agent/command.c b/agent/command.c index 5d082ed8a..deb5beb13 100644 --- a/agent/command.c +++ b/agent/command.c @@ -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 (;;) diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index ba7223634..07e620735 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -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)) |