summaryrefslogtreecommitdiffstats
path: root/g10
diff options
context:
space:
mode:
authorMarcus Brinkmann <mb@g10code.com>2009-11-25 18:58:26 +0100
committerMarcus Brinkmann <mb@g10code.com>2009-11-25 18:58:26 +0100
commit18bdcc08815a861db626d878205ab6b48f334b8a (patch)
tree3be7f2983fadb780bda191c645d4f0b886a2092b /g10
parentAdd gpgconf related dummy options default_pubkey_algo. (diff)
downloadgnupg2-18bdcc08815a861db626d878205ab6b48f334b8a.tar.xz
gnupg2-18bdcc08815a861db626d878205ab6b48f334b8a.zip
agent/
2009-11-25 Marcus Brinkmann <marcus@g10code.de> * command.c (start_command_handler): Use assuan_fd_t and assuan_fdopen on fds. scd/ 2009-11-25 Marcus Brinkmann <marcus@g10code.de> * command.c (scd_command_handler): Use assuan_fd_t and assuan_fdopen on fds. sm/ 2009-11-25 Marcus Brinkmann <marcus@g10code.de> * server.c (gpgsm_server): Use assuan_fd_t and assuan_fdopen on fds. g10/ 2009-11-25 Marcus Brinkmann <marcus@g10code.de> * server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
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 <marcus@g10code.de>
+
+ * server.c (gpg_server): Use assuan_fd_t and assuan_fdopen on fds.
+
2009-11-23 Werner Koch <wk@g10code.com>
* 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)
{