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 /tools/gpg-connect-agent.c | |
| 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 '')
| -rw-r--r-- | tools/gpg-connect-agent.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tools/gpg-connect-agent.c b/tools/gpg-connect-agent.c index a2fb1d136..895056fe7 100644 --- a/tools/gpg-connect-agent.c +++ b/tools/gpg-connect-agent.c @@ -1160,7 +1160,7 @@ main (int argc, char **argv) opt.homedir = default_homedir (); - opt.connect_flags = 1; /* Use extended connect mode. */ + opt.connect_flags = 1; /* Parse the command line. */ pargs.argc = &argc; @@ -1233,9 +1233,9 @@ main (int argc, char **argv) exit (1); } - rc = assuan_pipe_connect_ext (ctx, *argv, (const char **)argv, - no_close, NULL, NULL, - opt.connect_flags); + rc = assuan_pipe_connect + (ctx, *argv, (const char **)argv, no_close, NULL, NULL, + (opt.connect_flags & 1) ? ASSUAN_PIPE_CONNECT_FDPASSING : 0); if (rc) { log_error ("assuan_pipe_connect_ext failed: %s\n", @@ -1256,8 +1256,9 @@ main (int argc, char **argv) exit (1); } - rc = assuan_socket_connect_ext (ctx, opt.raw_socket, 0, - opt.connect_flags); + rc = assuan_socket_connect + (ctx, opt.raw_socket, 0, + (opt.connect_flags & 1) ? ASSUAN_SOCKET_CONNECT_FDPASSING : 0); if (rc) { log_error ("can't connect to socket `%s': %s\n", @@ -2114,7 +2115,7 @@ start_agent (void) /* Check whether we can connect at the standard socket. */ sockname = make_filename (opt.homedir, "S.gpg-agent", NULL); - rc = assuan_socket_connect (ctx, sockname, 0); + rc = assuan_socket_connect (ctx, sockname, 0, 0); #ifdef HAVE_W32_SYSTEM /* If we failed to connect under Windows, we fire up the agent. */ @@ -2148,7 +2149,7 @@ start_agent (void) exit (1); } - rc = assuan_socket_connect (ctx, sockname, 0); + rc = assuan_socket_connect (ctx, sockname, 0, 0); } if (rc) rc = save_rc; @@ -2188,7 +2189,7 @@ start_agent (void) exit (1); } - rc = assuan_socket_connect (ctx, infostr, pid); + rc = assuan_socket_connect (ctx, infostr, pid, 0); xfree (infostr); } |