2010-06-10 Marcus Brinkmann <marcus@g10code.de>

	* engine-gpgsm.c (gpgsm_new): Translate returned achild_fds back
	to child_fds.

diff --git a/src/ChangeLog b/src/ChangeLog
index f7aed4c6da1c096b315c601d6048e5b6f6992105..1f98f94353f6a46c68122590e759bcbc94519543 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
 2010-06-10  Marcus Brinkmann  <marcus@g10code.de>
 
+       * engine-gpgsm.c (gpgsm_new): Translate returned achild_fds back
+       to child_fds.
+
        * debug.h (TRACE_SUC6): New macro.
        * w32-io.c (MAX_SLAFD): New macro.
        (fd_table): New static variable.

diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
index 64189bf8ec326c26cb52152e40ed1df2d797aace..64be281ce2d8aebb008e26720a02e37776e7d63c 100644 (file)
--- a/src/engine-gpgsm.c
+++ b/src/engine-gpgsm.c
@@ -351,6 +351,10 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir)
     err = assuan_pipe_connect
       (gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (),
        argv, achild_fds, NULL, NULL, 0);
+
+    /* For now... */
+    for (i = 0; i < 4; i++)
+      child_fds[i] = (int) achild_fds[i];
   }
 
   /* On Windows, handles are inserted in the spawned process with