diff options
Diffstat (limited to 'agent')
| -rw-r--r-- | agent/ChangeLog | 8 | ||||
| -rw-r--r-- | agent/Makefile.am | 4 | ||||
| -rw-r--r-- | agent/gpg-agent.c | 7 |
3 files changed, 15 insertions, 4 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog index 59674b49b..242d2f0a1 100644 --- a/agent/ChangeLog +++ b/agent/ChangeLog @@ -1,3 +1,11 @@ +2009-10-16 Marcus Brinkmann <[email protected]> + + * gpg_agent_CFLAGS, gpg_agent_LDADD: Use libassuan instead of + libassuan-pth. + * gpg-agent.c: Invoke ASSUAN_SYSTEM_PTH_IMPL. + (main): Call assuan_set_system_hooks and assuan_sock_init. + Fix invocation of assuan_socket_connect. + 2009-09-23 Werner Koch <[email protected]> * command.c (register_commands) [HAVE_ASSUAN_SET_IO_MONITOR]: diff --git a/agent/Makefile.am b/agent/Makefile.am index c2830a94b..38200c1d8 100644 --- a/agent/Makefile.am +++ b/agent/Makefile.am @@ -62,9 +62,9 @@ gpg_agent_res_deps = #endif -gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_PTH_CFLAGS) $(PTH_CFLAGS) +gpg_agent_CFLAGS = $(AM_CFLAGS) $(LIBASSUAN_CFLAGS) $(PTH_CFLAGS) gpg_agent_LDADD = $(commonpth_libs) \ - $(LIBGCRYPT_LIBS) $(LIBASSUAN_PTH_LIBS) $(PTH_LIBS) \ + $(LIBGCRYPT_LIBS) $(LIBASSUAN_LIBS) $(PTH_LIBS) \ $(GPG_ERROR_LIBS) $(LIBINTL) $(NETLIBS) $(LIBICONV) gpg_agent_LDFLAGS = $(gpg_agent_res_ldflags) gpg_agent_DEPENDENCIES = $(gpg_agent_res_deps) diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 4493c7abd..be7da2009 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -50,7 +50,6 @@ #include "gc-opt-flags.h" #include "exechelp.h" - enum cmd_and_opt_values { aNull = 0, oCsh = 'c', @@ -276,6 +275,8 @@ static void check_own_socket (void); static int check_for_running_agent (int silent, int mode); /* Pth wrapper function definitions. */ +ASSUAN_SYSTEM_PTH_IMPL; + GCRY_THREAD_OPTION_PTH_IMPL; static int fixed_gcry_pth_init (void) { @@ -593,6 +594,8 @@ 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_PTH); + assuan_sock_init (); setup_libgcrypt_logging (); gcry_control (GCRYCTL_USE_SECURE_RNDPOOL); @@ -2217,7 +2220,7 @@ check_for_running_agent (int silent, int mode) rc = assuan_new (&ctx); if (! rc) - rc = assuan_socket_connect (&ctx, infostr, pid); + rc = assuan_socket_connect (ctx, infostr, pid); xfree (infostr); if (rc) { |