aboutsummaryrefslogtreecommitdiffstats
path: root/kbx/keyboxd.c
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2019-09-10 13:52:12 +0000
committerWerner Koch <[email protected]>2019-09-10 13:52:12 +0000
commit6c327b4dd6d8041b84f856ffc2a7d82b352d273f (patch)
tree2d90034c90766474315c72f53be626cc2ccbe86b /kbx/keyboxd.c
parentcommon: Allow a readlimit for iobuf_esopen. (diff)
downloadgnupg-6c327b4dd6d8041b84f856ffc2a7d82b352d273f.tar.gz
gnupg-6c327b4dd6d8041b84f856ffc2a7d82b352d273f.zip
kbx: Allow fd-passing for the keyboxd.
* kbx/kbxserver.c: Include host2net.h (struct server_local_s): Add field outstream. (prepare_outstream): New. (kbxd_writen): New. (kbxd_write_data_line): Write to file descrptor. Disable the slow human reader friendly data line formatting. (cmd_search, cmd_next): Disable data logging. (kbxd_start_command_handler): Add OUTPUT command. * kbx/keyboxd.c (main): Enable log monitor. -- Signed-off-by: Werner Koch <[email protected]>
Diffstat (limited to 'kbx/keyboxd.c')
-rw-r--r--kbx/keyboxd.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/kbx/keyboxd.c b/kbx/keyboxd.c
index 5a34f237f..d39b35749 100644
--- a/kbx/keyboxd.c
+++ b/kbx/keyboxd.c
@@ -58,6 +58,12 @@
#include "../common/exechelp.h"
#include "frontend.h"
+
+/* Urrgs: Put this into a separate header - but it needs assuan.h first. */
+extern int kbxd_assuan_log_monitor (assuan_context_t ctx, unsigned int cat,
+ const char *msg);
+
+
enum cmd_and_opt_values
{
aNull = 0,
@@ -488,7 +494,7 @@ main (int argc, char **argv )
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
assuan_sock_init ();
assuan_sock_set_system_hooks (ASSUAN_SYSTEM_NPTH);
- setup_libassuan_logging (&opt.debug, NULL);
+ setup_libassuan_logging (&opt.debug, kbxd_assuan_log_monitor);
setup_libgcrypt_logging ();
gcry_set_progress_handler (kbxd_libgcrypt_progress_cb, NULL);