aboutsummaryrefslogtreecommitdiffstats
path: root/agent
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--agent/ChangeLog5
-rw-r--r--agent/call-pinentry.c4
-rw-r--r--agent/call-scd.c4
3 files changed, 9 insertions, 4 deletions
diff --git a/agent/ChangeLog b/agent/ChangeLog
index 1c1c6e8e7..5618f06d6 100644
--- a/agent/ChangeLog
+++ b/agent/ChangeLog
@@ -1,3 +1,8 @@
+2009-12-08 Marcus Brinkmann <[email protected]>
+
+ * call-pinentry.c (start_pinentry): Convert posix fd to assuan fd.
+ * call-scd.c (start_scd): Likewise.
+
2009-12-03 Werner Koch <[email protected]>
* gpg-agent.c (set_debug): Allow for numerical debug leveles. Print
diff --git a/agent/call-pinentry.c b/agent/call-pinentry.c
index c5a6f7814..46293d96e 100644
--- a/agent/call-pinentry.c
+++ b/agent/call-pinentry.c
@@ -304,8 +304,8 @@ start_pinentry (ctrl_t ctrl)
if (!opt.running_detached)
{
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;
diff --git a/agent/call-scd.c b/agent/call-scd.c
index 83b99335d..f3303c11d 100644
--- a/agent/call-scd.c
+++ b/agent/call-scd.c
@@ -333,8 +333,8 @@ start_scd (ctrl_t ctrl)
if (!opt.running_detached)
{
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;