diff options
| author | Marcus Brinkmann <mb@g10code.com> | 2009-11-05 13:06:45 +0100 |
|---|---|---|
| committer | Marcus Brinkmann <mb@g10code.com> | 2009-11-05 13:06:45 +0100 |
| commit | 1d3c39fd7bf6d43538ad44143bd92f49ea835a43 (patch) | |
| tree | 11a0ed07ed694fba18a790d1fc5bad86550ae96a /common | |
| parent | Initialize opt.session_env. (diff) | |
| download | gnupg2-1d3c39fd7bf6d43538ad44143bd92f49ea835a43.tar.xz gnupg2-1d3c39fd7bf6d43538ad44143bd92f49ea835a43.zip | |
agent/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-pinentry.c (start_pinentry): Call assuan_pipe_connect, not
assuan_pipe_connect_ext.
* command.c (start_command_handler): Change
assuan_init_socket_server_ext into assuan_init_socket_server.
* call-scd.c (start_scd): Update use of assuan_socket_connect and
assuan_pipe_connect.
* gpg-agent.c (check_own_socket_thread, check_for_running_agent):
Update use of assuan_socket_connect.
common/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* asshelp.c (start_new_gpg_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
scd/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* command.c (scd_command_handler): Call assuan_init_socket_server,
not assuan_init_socket_server_ext.
sm/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* call-dirmngr.c (start_dirmngr_ext): Update use of
assuan_pipe_connect and assuan_socket_connect.
tools/
2009-11-05 Marcus Brinkmann <marcus@g10code.de>
* gpg-connect-agent.c (start_agent): Update use of
assuan_socket_connect and assuan_pipe_connect.
Diffstat (limited to 'common')
| -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 <marcus@g10code.de> + + * asshelp.c (start_new_gpg_agent): Update use of + assuan_socket_connect and assuan_pipe_connect. + 2009-11-02 Marcus Brinkmann <marcus@g10code.de> * 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) { |