mirror of git://git.gnupg.org/gnupg.git
common/
2009-12-08 Marcus Brinkmann <marcus@g10code.de> * asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD. agent/ 2009-12-08 Marcus Brinkmann <marcus@g10code.de> * call-pinentry.c (start_pinentry): Convert posix fd to assuan fd. * call-scd.c (start_scd): Likewise. sm/ 2009-12-08 Marcus Brinkmann <marcus@g10code.de> * call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd. tools/ 2009-12-08 Marcus Brinkmann <marcus@g10code.de> * gpg-connect-agent.c (main): Convert posix fd to assuan fd.
This commit is contained in:
parent
e347e5667d
commit
146a4665bb
|
@ -1,3 +1,8 @@
|
||||||
|
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
|
* call-pinentry.c (start_pinentry): Convert posix fd to assuan fd.
|
||||||
|
* call-scd.c (start_scd): Likewise.
|
||||||
|
|
||||||
2009-12-03 Werner Koch <wk@g10code.com>
|
2009-12-03 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
* gpg-agent.c (set_debug): Allow for numerical debug leveles. Print
|
* gpg-agent.c (set_debug): Allow for numerical debug leveles. Print
|
||||||
|
|
|
@ -304,8 +304,8 @@ start_pinentry (ctrl_t ctrl)
|
||||||
if (!opt.running_detached)
|
if (!opt.running_detached)
|
||||||
{
|
{
|
||||||
if (log_get_fd () != -1)
|
if (log_get_fd () != -1)
|
||||||
no_close_list[i++] = log_get_fd ();
|
no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
|
||||||
no_close_list[i++] = fileno (stderr);
|
no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
|
||||||
}
|
}
|
||||||
no_close_list[i] = -1;
|
no_close_list[i] = -1;
|
||||||
|
|
||||||
|
|
|
@ -333,8 +333,8 @@ start_scd (ctrl_t ctrl)
|
||||||
if (!opt.running_detached)
|
if (!opt.running_detached)
|
||||||
{
|
{
|
||||||
if (log_get_fd () != -1)
|
if (log_get_fd () != -1)
|
||||||
no_close_list[i++] = log_get_fd ();
|
no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
|
||||||
no_close_list[i++] = fileno (stderr);
|
no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
|
||||||
}
|
}
|
||||||
no_close_list[i] = -1;
|
no_close_list[i] = -1;
|
||||||
|
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
|
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
|
* asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD.
|
||||||
|
|
||||||
* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
|
* asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing
|
||||||
argument in assuan_socket_connect invocation.
|
argument in assuan_socket_connect invocation.
|
||||||
* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
|
* iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function
|
||||||
|
|
|
@ -268,8 +268,8 @@ start_new_gpg_agent (assuan_context_t *r_ctx,
|
||||||
|
|
||||||
i=0;
|
i=0;
|
||||||
if (log_get_fd () != -1)
|
if (log_get_fd () != -1)
|
||||||
no_close_list[i++] = log_get_fd ();
|
no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
|
||||||
no_close_list[i++] = fileno (stderr);
|
no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
|
||||||
no_close_list[i] = -1;
|
no_close_list[i] = -1;
|
||||||
|
|
||||||
/* Connect to the agent and perform initial handshaking. */
|
/* Connect to the agent and perform initial handshaking. */
|
||||||
|
|
|
@ -92,12 +92,12 @@ start_gpg (ctrl_t ctrl, int input_fd, int output_fd, assuan_context_t *r_ctx)
|
||||||
|
|
||||||
i = 0;
|
i = 0;
|
||||||
if (log_get_fd () != -1)
|
if (log_get_fd () != -1)
|
||||||
no_close_list[i++] = log_get_fd ();
|
no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
|
||||||
no_close_list[i++] = fileno (stderr);
|
no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
|
||||||
if (input_fd != -1)
|
if (input_fd != -1)
|
||||||
no_close_list[i++] = input_fd;
|
no_close_list[i++] = assuan_fd_from_posix_fd (input_fd);
|
||||||
if (output_fd != -1)
|
if (output_fd != -1)
|
||||||
no_close_list[i++] = output_fd;
|
no_close_list[i++] = assuan_fd_from_posix_fd (output_fd);
|
||||||
no_close_list[i] = -1;
|
no_close_list[i] = -1;
|
||||||
|
|
||||||
/* Connect to GPG and perform initial handshaking. */
|
/* Connect to GPG and perform initial handshaking. */
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
|
* call-dirmngr.c (start_dirmngr_ext): Convert posix fd to assuan fd.
|
||||||
|
|
||||||
2009-12-03 Werner Koch <wk@g10code.com>
|
2009-12-03 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
* gpgsm.c (set_debug): Allow for numerical debug leveles. Print
|
* gpgsm.c (set_debug): Allow for numerical debug leveles. Print
|
||||||
|
|
|
@ -258,8 +258,8 @@ start_dirmngr_ext (ctrl_t ctrl, assuan_context_t *ctx_r)
|
||||||
|
|
||||||
i=0;
|
i=0;
|
||||||
if (log_get_fd () != -1)
|
if (log_get_fd () != -1)
|
||||||
no_close_list[i++] = log_get_fd ();
|
no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ());
|
||||||
no_close_list[i++] = fileno (stderr);
|
no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr));
|
||||||
no_close_list[i] = -1;
|
no_close_list[i] = -1;
|
||||||
|
|
||||||
/* connect to the agent and perform initial handshaking */
|
/* connect to the agent and perform initial handshaking */
|
||||||
|
|
|
@ -1,3 +1,7 @@
|
||||||
|
2009-12-08 Marcus Brinkmann <marcus@g10code.de>
|
||||||
|
|
||||||
|
* gpg-connect-agent.c (main): Convert posix fd to assuan fd.
|
||||||
|
|
||||||
2009-12-07 Werner Koch <wk@g10code.com>
|
2009-12-07 Werner Koch <wk@g10code.com>
|
||||||
|
|
||||||
* no-libgcrypt.c (gcry_strdup): Actually copy the string.
|
* no-libgcrypt.c (gcry_strdup): Actually copy the string.
|
||||||
|
|
|
@ -1222,8 +1222,8 @@ main (int argc, char **argv)
|
||||||
{
|
{
|
||||||
int no_close[3];
|
int no_close[3];
|
||||||
|
|
||||||
no_close[0] = fileno (stderr);
|
no_close[0] = assuan_fd_from_posix_fd (fileno (stderr));
|
||||||
no_close[1] = log_get_fd ();
|
no_close[1] = assuan_fd_from_posix_fd (log_get_fd ());
|
||||||
no_close[2] = -1;
|
no_close[2] = -1;
|
||||||
|
|
||||||
rc = assuan_new (&ctx);
|
rc = assuan_new (&ctx);
|
||||||
|
|
Loading…
Reference in New Issue