diff options
| author | NIIBE Yutaka <[email protected]> | 2017-12-06 02:20:51 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-12-06 02:20:51 +0000 |
| commit | 1524ba9656f0205d8c6ef504f773b832a7a12ab9 (patch) | |
| tree | 7bfb2233e318fd47d9df7457b8b9f29d6d2eb4e9 | |
| parent | g10: Fix regexp sanitization. (diff) | |
| download | gnupg-1524ba9656f0205d8c6ef504f773b832a7a12ab9.tar.gz gnupg-1524ba9656f0205d8c6ef504f773b832a7a12ab9.zip | |
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 <[email protected]>
Diffstat (limited to '')
| -rw-r--r-- | agent/gpg-agent.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 1696e4ecd..b076ca3b8 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); |