aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcus Brinkmann <[email protected]>2010-06-10 16:13:14 +0000
committerMarcus Brinkmann <[email protected]>2010-06-10 16:13:14 +0000
commit99c855353f0575efb27a0e82d4b68db1f160bed6 (patch)
treeea75aa47fcdb2c3487ceecd7f5fd054ef2ae7121
parent2010-06-10 Marcus Brinkmann <[email protected]> (diff)
downloadgpgme-99c855353f0575efb27a0e82d4b68db1f160bed6.tar.gz
gpgme-99c855353f0575efb27a0e82d4b68db1f160bed6.zip
2010-06-10 Marcus Brinkmann <[email protected]>
* engine-gpgsm.c (gpgsm_new): Translate returned achild_fds back to child_fds.
-rw-r--r--src/ChangeLog3
-rw-r--r--src/engine-gpgsm.c4
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index f7aed4c6..1f98f943 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,8 @@
2010-06-10 Marcus Brinkmann <[email protected]>
+ * 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 64189bf8..64be281c 100644
--- 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