mirror of
git://git.gnupg.org/gnupg.git
synced 2024-06-08 23:37:47 +02:00
agent: Change intialization of assuan socket system hooks.
* agent/gpg-agent.c (initialize_modules): Add hook again.
(main): Remove setting of the system houk but add scoket system hook
setting after assuan initialization.
--
Thread initialization is better to be deferred after fork (in case of
UNIX). assuan_sock_init should be earlier. Thus, we need to change
system hooks for assuan_sock_* interface. Or else, on Windows, it may
cause hang on server.
Updates-commit: 1524ba9656
GnuPG-bug-id: 3378
Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
parent
1524ba9656
commit
b9677ba16f
|
@ -966,6 +966,7 @@ static void
|
||||||
initialize_modules (void)
|
initialize_modules (void)
|
||||||
{
|
{
|
||||||
thread_init_once ();
|
thread_init_once ();
|
||||||
|
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
|
||||||
initialize_module_cache ();
|
initialize_module_cache ();
|
||||||
initialize_module_call_pinentry ();
|
initialize_module_call_pinentry ();
|
||||||
initialize_module_call_scd ();
|
initialize_module_call_scd ();
|
||||||
|
@ -1026,8 +1027,8 @@ main (int argc, char **argv )
|
||||||
malloc_hooks.free = gcry_free;
|
malloc_hooks.free = gcry_free;
|
||||||
assuan_set_malloc_hooks (&malloc_hooks);
|
assuan_set_malloc_hooks (&malloc_hooks);
|
||||||
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
|
assuan_set_gpg_err_source (GPG_ERR_SOURCE_DEFAULT);
|
||||||
assuan_set_system_hooks (ASSUAN_SYSTEM_NPTH);
|
|
||||||
assuan_sock_init ();
|
assuan_sock_init ();
|
||||||
|
assuan_sock_set_system_hooks (ASSUAN_SYSTEM_NPTH);
|
||||||
setup_libassuan_logging (&opt.debug, NULL);
|
setup_libassuan_logging (&opt.debug, NULL);
|
||||||
|
|
||||||
setup_libgcrypt_logging ();
|
setup_libgcrypt_logging ();
|
||||||
|
|
Loading…
Reference in New Issue
Block a user