aboutsummaryrefslogtreecommitdiffstats
path: root/g13/g13.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2010-03-11 12:34:11 +0000
committerWerner Koch <[email protected]>2010-03-11 12:34:11 +0000
commit37870234a195fb76f36284ac4bdb5dc172078724 (patch)
treef65b4c42925edb20ff4149a977d12a4d31d432a0 /g13/g13.c
parentChange logging to use estream. The makes logging to a socket also (diff)
downloadgnupg-37870234a195fb76f36284ac4bdb5dc172078724.tar.gz
gnupg-37870234a195fb76f36284ac4bdb5dc172078724.zip
Use a custom log handler for libassuan.
Diffstat (limited to 'g13/g13.c')
-rw-r--r--g13/g13.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/g13/g13.c b/g13/g13.c
index 5058d2c46..28dfa8d36 100644
--- a/g13/g13.c
+++ b/g13/g13.c
@@ -35,6 +35,7 @@
#include "i18n.h"
#include "sysutils.h"
#include "gc-opt-flags.h"
+#include "asshelp.h"
#include "keyblob.h"
#include "server.h"
#include "runner.h"
@@ -432,10 +433,9 @@ main ( int argc, char **argv)
}
/* Prepare libassuan. */
- 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);
-
+ setup_libassuan_logging (&opt.debug);
/* Setup a default control structure for command line mode. */
memset (&ctrl, 0, sizeof ctrl);
@@ -799,7 +799,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 ()); */
mountinfo_dump_all ();
break;