[Pkg-gnupg-commit] [gnupg2] 09/42: agent: Set assuan system hooks before call of assuan_sock_init.

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch upstream
in repository gnupg2.

commit 1524ba9656f0205d8c6ef504f773b832a7a12ab9
Author: NIIBE Yutaka <gniibe at fsij.org>
Date:   Wed Dec 6 11:20:51 2017 +0900

    agent: Set assuan system hooks before call of assuan_sock_init.
    
    * agent/gpg-agent.c (initialize_modules): Move assuan_set_system_hooks.
    (main): ... here, just before assuan_sock_init.
    
    --
    
    In Assuan, global variable SOCK_CTX is used internally, which is
    initialized by assuan_sock_init.  When initialized, system hooks
    are copied into SOCK_CTX structure.  Thus, system hooks should
    be set, before the call of assuan_sock_init.
    
    GnuPG-bug-id: 3378
    Signed-off-by: NIIBE Yutaka <gniibe at fsij.org>
---
 agent/gpg-agent.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c
index 1696e4e..b076ca3 100644
--- a/agent/gpg-agent.c
+++ b/agent/gpg-agent.c
@@ -966,7 +966,6 @@ static void
 initialize_modules (void)
 {
   thread_init_once ();
-  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
   initialize_module_cache ();
   initialize_module_call_pinentry ();
   initialize_module_call_scd ();
@@ -1027,6 +1026,7 @@ main (int argc, char **argv )
   malloc_hooks.free = gcry_free;
   assuan_set_malloc_hooks (&malloc_hooks);
   assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
+  assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
   assuan_sock_init ();
   setup_libassuan_logging (&opt.debug, NULL);
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git