From 1d3c39fd7bf6d43538ad44143bd92f49ea835a43 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Thu, 5 Nov 2009 12:06:45 +0000 Subject: agent/ 2009-11-05 Marcus Brinkmann * 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 * asshelp.c (start_new_gpg_agent): Update use of assuan_socket_connect and assuan_pipe_connect. scd/ 2009-11-05 Marcus Brinkmann * command.c (scd_command_handler): Call assuan_init_socket_server, not assuan_init_socket_server_ext. sm/ 2009-11-05 Marcus Brinkmann * call-dirmngr.c (start_dirmngr_ext): Update use of assuan_pipe_connect and assuan_socket_connect. tools/ 2009-11-05 Marcus Brinkmann * gpg-connect-agent.c (start_agent): Update use of assuan_socket_connect and assuan_pipe_connect. --- agent/call-scd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'agent/call-scd.c') diff --git a/agent/call-scd.c b/agent/call-scd.c index 521086848..83b99335d 100644 --- a/agent/call-scd.c +++ b/agent/call-scd.c @@ -278,7 +278,7 @@ start_scd (ctrl_t ctrl) if (socket_name) { - rc = assuan_socket_connect (ctx, socket_name, 0); + rc = assuan_socket_connect (ctx, socket_name, 0, 0); if (rc) { log_error ("can't connect to socket `%s': %s\n", @@ -341,8 +341,8 @@ start_scd (ctrl_t ctrl) /* Connect to the pinentry and perform initial handshaking. Use detached flag (128) so that under W32 SCDAEMON does not show up a new window. */ - rc = assuan_pipe_connect_ext (ctx, opt.scdaemon_program, argv, - no_close_list, atfork_cb, NULL, 128); + rc = assuan_pipe_connect (ctx, opt.scdaemon_program, argv, + no_close_list, atfork_cb, NULL, 128); if (rc) { log_error ("can't connect to the SCdaemon: %s\n", -- cgit v1.2.3