diff options
Diffstat (limited to 'common')
| -rw-r--r-- | common/ChangeLog | 2 | ||||
| -rw-r--r-- | common/asshelp.c | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/common/ChangeLog b/common/ChangeLog index e3d8f8b5a..df058a8fe 100644 --- a/common/ChangeLog +++ b/common/ChangeLog @@ -1,5 +1,7 @@ 2009-12-08 Marcus Brinkmann <[email protected]> + * asshelp.c (start_new_gpg_agent): Convert posix FD to assuan FD. + * asshelp.c (start_new_gpg_agent) [HAVE_W32_SYSTEM]: Add missing argument in assuan_socket_connect invocation. * iobuf.c (iobuf_open_fd_or_name): Fix type of FD in function diff --git a/common/asshelp.c b/common/asshelp.c index 09ef10ba8..b2d13f32b 100644 --- a/common/asshelp.c +++ b/common/asshelp.c @@ -268,8 +268,8 @@ start_new_gpg_agent (assuan_context_t *r_ctx, i=0; if (log_get_fd () != -1) - no_close_list[i++] = log_get_fd (); - no_close_list[i++] = fileno (stderr); + no_close_list[i++] = assuan_fd_from_posix_fd (log_get_fd ()); + no_close_list[i++] = assuan_fd_from_posix_fd (fileno (stderr)); no_close_list[i] = -1; /* Connect to the agent and perform initial handshaking. */ |