security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

agent/

Browse source 
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.
This commit is contained in:
Marcus Brinkmann 2009-11-05 12:06:45 +00:00
parent a5c7929900
commit 1d3c39fd7b
15 changed files with 61 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

19
tools/gpg-connect-agent.c
View file

@ -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);
}