aboutsummaryrefslogtreecommitdiffstats
path: root/dirmngr/dirmngr.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2019-01-25 01:15:39 +0000
committerNIIBE Yutaka <[email protected]>2019-01-25 01:15:39 +0000
commit1f8817475f59ede3f28f57edc10ba56bbdd08b49 (patch)
tree5abec430aa258b706e36d96346bab1fa696c0aa0 /dirmngr/dirmngr.c
parentcommon: Extend function percent_data_escape. (diff)
downloadgnupg-1f8817475f59ede3f28f57edc10ba56bbdd08b49.tar.gz
gnupg-1f8817475f59ede3f28f57edc10ba56bbdd08b49.zip
dirmngr: Fix initialization of assuan's nPth hook.
* dirmngr/dirmngr.c (main): Move assuan_set_system_hooks to... (thread_init): ... here. Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to '')
-rw-r--r--dirmngr/dirmngr.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 80fb13476..5b9e7a86e 100644
--- a/dirmngr/dirmngr.c
+++ b/dirmngr/dirmngr.c
@@ -802,6 +802,7 @@ static void
thread_init (void)
{
npth_init ();
+ assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
gpgrt_set_syscall_clamp (npth_unprotect, npth_protect);
/* Now with NPth running we can set the logging callback. Our
@@ -877,7 +878,6 @@ main (int argc, char **argv)
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_NPTH);
assuan_sock_init ();
setup_libassuan_logging (&opt.debug, dirmngr_assuan_log_monitor);