diff options
| author | Werner Koch <[email protected]> | 2010-03-11 12:34:11 +0000 |
|---|---|---|
| committer | Werner Koch <[email protected]> | 2010-03-11 12:34:11 +0000 |
| commit | 37870234a195fb76f36284ac4bdb5dc172078724 (patch) | |
| tree | f65b4c42925edb20ff4149a977d12a4d31d432a0 /scd/scdaemon.c | |
| parent | Change logging to use estream. The makes logging to a socket also (diff) | |
| download | gnupg-37870234a195fb76f36284ac4bdb5dc172078724.tar.gz gnupg-37870234a195fb76f36284ac4bdb5dc172078724.zip | |
Use a custom log handler for libassuan.
Diffstat (limited to 'scd/scdaemon.c')
| -rw-r--r-- | scd/scdaemon.c | 7 |
1 files changed, 5 insertions, 2 deletions
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; |