[git] GnuPG - branch, master, updated. gnupg-2.2.7-328-g1f88174

[by NIIBE Yutaka]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, master has been updated
       via  1f8817475f59ede3f28f57edc10ba56bbdd08b49 (commit)
      from  055f8854d3f49b8d06105d20f344f5ac10e4f6a6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 1f8817475f59ede3f28f57edc10ba56bbdd08b49
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Fri Jan 25 10:15:39 2019 +0900

    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 <gniibe at fsij.org>

diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c
index 80fb134..5b9e7a8 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);
 

-----------------------------------------------------------------------

Summary of changes:
 dirmngr/dirmngr.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org