aboutsummaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
Diffstat (limited to 'g10')
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/server.c4
2 files changed, 6 insertions, 2 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 944326579..c8978f6d5 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2009-11-25 Marcus Brinkmann <[email protected]>
+
+ * server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
+
2009-11-23 Werner Koch <[email protected]>
* gpg.c (gpgconf_list): Add key "default_pubkey_algo".
diff --git a/g10/server.c b/g10/server.c
index 8b5694128..ee8089491 100644
--- a/g10/server.c
+++ b/g10/server.c
@@ -658,8 +658,8 @@ gpg_server (ctrl_t ctrl)
/* We use a pipe based server so that we can work from scripts.
assuan_init_pipe_server will automagically detect when we are
called with a socketpair and ignore FILEDES in this case. */
- filedes[0] = 0;
- filedes[1] = 1;
+ filedes[0] = assuan_fdopen (0);
+ filedes[1] = assuan_fdopen (1);
rc = assuan_new (&ctx);
if (rc)
{