diff options
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/ChangeLog | 8 | ||||
| -rw-r--r-- | scd/command.c | 3 | ||||
| -rw-r--r-- | scd/scdaemon.c | 7 |
3 files changed, 13 insertions, 5 deletions
diff --git a/scd/ChangeLog b/scd/ChangeLog index 44497364d..3bb00f178 100644 --- a/scd/ChangeLog +++ b/scd/ChangeLog @@ -1,3 +1,11 @@ +2010-03-11 Werner Koch <[email protected]> + + * scdaemon.c: Include "asshelp.h". + (main): Remove assuan_set_assuan_log_prefix. Add + assuan_set_log_cb. + (handle_signal): Disable pth ctrl dumping. + * command.c (scd_command_handler): Remove assuan_set_log_stream. + 2010-03-10 Werner Koch <[email protected]> * Makefile.am (scdaemon_LDADD): Remove libjnlib.a. diff --git a/scd/command.c b/scd/command.c index 2e7c5b998..fa1d46ce1 100644 --- a/scd/command.c +++ b/scd/command.c @@ -1947,9 +1947,6 @@ scd_command_handler (ctrl_t ctrl, int fd) ctrl->server_local->ctrl_backlink = ctrl; ctrl->server_local->assuan_ctx = ctx; - if (DBG_ASSUAN) - assuan_set_log_stream (ctx, log_get_stream ()); - /* We open the reader right at startup so that the ticker is able to update the status file. */ if (ctrl->reader_slot == -1) diff --git a/scd/scdaemon.c b/scd/scdaemon.c index fd7d6a22f..9a5e01f31 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -52,6 +52,7 @@ #include "ccid-driver.h" #include "mkdtemp.h" #include "gc-opt-flags.h" +#include "asshelp.h" enum cmd_and_opt_values { aNull = 0, @@ -432,10 +433,10 @@ main (int argc, char **argv ) malloc_hooks.realloc = gcry_realloc; malloc_hooks.free = gcry_free; assuan_set_malloc_hooks (&malloc_hooks); - assuan_set_assuan_log_prefix (log_get_prefix (NULL)); assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT); assuan_set_system_hooks (ASSUAN_SYSTEM_PTH); assuan_sock_init (); + setup_libassuan_logging (&opt.debug); setup_libgcrypt_logging (); gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); @@ -951,7 +952,9 @@ handle_signal (int signo) case SIGUSR1: log_info ("SIGUSR1 received - printing internal information:\n"); - pth_ctrl (PTH_CTRL_DUMPSTATE, log_get_stream ()); + /* Fixme: We need to see how to integrate pth dumping into our + logging system. */ + /* pth_ctrl (PTH_CTRL_DUMPSTATE, log_get_stream ()); */ app_dump_state (); break; |