aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2003-12-16 16:30:55 +0000
committerWerner Koch <[email protected]>2003-12-16 16:30:55 +0000
commitf438224daea48f5658a8703a4d6d6c7060f026ae (patch)
tree8c412fd7791e6c3b51cc01eb5d1f4cbf7c2312f5
parent(writen, fun_writer, fun_closer): New. (diff)
downloadgnupg-f438224daea48f5658a8703a4d6d6c7060f026ae.tar.gz
gnupg-f438224daea48f5658a8703a4d6d6c7060f026ae.zip
(main): Set the prefixes for assuan logging.
Diffstat (limited to '')
-rw-r--r--agent/ChangeLog4
-rw-r--r--agent/gpg-agent.c2
-rw-r--r--scd/ChangeLog4
-rw-r--r--scd/scdaemon.c4
4 files changed, 14 insertions, 0 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index c4a37f5e8..0e165e31b 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-16 Werner Koch <[email protected]>
+
+ * gpg-agent.c (main): Set the prefixes for assuan logging.
+
2003-12-15 Werner Koch <[email protected]>
* protect.c (do_encryption): Use gcry_create_nonce instad of the
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 675f2be3f..47420117e 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -355,6 +355,8 @@ main (int argc, char **argv )
}
assuan_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free);
+ assuan_set_assuan_log_stream (log_get_stream ());
+ assuan_set_assuan_log_prefix (log_get_prefix (NULL));
gcry_set_log_handler (my_gcry_logger, NULL);
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);
diff --git a/scd/ChangeLog b/scd/ChangeLog
index 873691f63..6b9654f58 100644
--- a/scd/ChangeLog
+++ b/scd/ChangeLog
@@ -1,3 +1,7 @@
+2003-12-16 Werner Koch <[email protected]>
+
+ * scdaemon.c (main): Set the prefixes for assuan logging.
+
2003-11-17 Werner Koch <[email protected]>
* scdaemon.c, scdaemon.h: New options --allow-admin and --deny-admin.
diff --git a/scd/scdaemon.c b/scd/scdaemon.c
index a3100988b..91ac93227 100644
--- a/scd/scdaemon.c
+++ b/scd/scdaemon.c
@@ -272,7 +272,11 @@ main (int argc, char **argv )
}
ksba_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free);
+
assuan_set_malloc_hooks (gcry_malloc, gcry_realloc, gcry_free);
+ assuan_set_assuan_log_stream (log_get_stream ());
+ assuan_set_assuan_log_prefix (log_get_prefix (NULL));
+
gcry_set_log_handler (my_gcry_logger, NULL);
gcry_control (GCRYCTL_USE_SECURE_RNDPOOL);