diff options
Diffstat (limited to '')
| -rw-r--r-- | common/ChangeLog | 5 | ||||
| -rw-r--r-- | common/asshelp.c | 6 |
2 files changed, 8 insertions, 3 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index 9468bfe3a..a519f3850 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,3 +1,8 @@ +2009-11-05 Marcus Brinkmann <[email protected]> + + * asshelp.c (start_new_gpg_agent): Update use of + assuan_socket_connect and assuan_pipe_connect. + 2009-11-02 Marcus Brinkmann <[email protected]> * get-passphrase.c (default_inq_cb, membuf_data_cb): Change return diff --git a/common/asshelp.c b/common/asshelp.c index 47b86ee1c..e5a3f8c1f 100644 --- a/common/asshelp.c +++ b/common/asshelp.c @@ -199,7 +199,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx, /* First check whether we can connect at the standard socket. */ sockname = make_filename (homedir, "S.gpg-agent", NULL); - rc = assuan_socket_connect (ctx, sockname, 0); + rc = assuan_socket_connect (ctx, sockname, 0, 0); if (rc) { @@ -274,7 +274,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx, /* Connect to the agent and perform initial handshaking. */ rc = assuan_pipe_connect (ctx, agent_program, argv, - no_close_list); + no_close_list, NULL, NULL, 0); } #endif /*!HAVE_W32_SYSTEM*/ } @@ -307,7 +307,7 @@ start_new_gpg_agent (assuan_context_t *r_ctx, goto restart; } - rc = assuan_socket_connect (ctx, infostr, pid); + rc = assuan_socket_connect (ctx, infostr, pid, 0); xfree (infostr); if (gpg_err_code (rc) == GPG_ERR_ASS_CONNECT_FAILED) { |