Author: marcus
Date: 2009-11-05 13:10:04 +0100 (Thu, 05 Nov 2009)
New Revision: 1419
Modified:
trunk/src/ChangeLog
trunk/src/engine-assuan.c
trunk/src/engine-g13.c
trunk/src/engine-gpgsm.c
Log:
2009-11-05 Marcus Brinkmann <marcus at g10code.de>
* engine-assuan.c (llass_new): Update use of assuan_socket_connect.
* engine-gpgsm.c (gpgsm_new): Update use of assuan_pipe_connect.
* engine-g13.c (g13_new): Likewise.
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2009-11-05 02:39:31 UTC (rev 1418)
+++ trunk/src/ChangeLog 2009-11-05 12:10:04 UTC (rev 1419)
@@ -1,5 +1,9 @@
2009-11-05 Marcus Brinkmann <marcus at g10code.de>
+ * engine-assuan.c (llass_new): Update use of assuan_socket_connect.
+ * engine-gpgsm.c (gpgsm_new): Update use of assuan_pipe_connect.
+ * engine-g13.c (g13_new): Likewise.
+
* priv-io.h (IOSPAWN_FLAG_NOCLOSE): New flag.
* w32-io.c (_gpgme_io_spawn): Implement this flag.
* posix-io.c (_gpgme_io_spawn): Likewise.
Modified: trunk/src/engine-assuan.c
===================================================================
--- trunk/src/engine-assuan.c 2009-11-05 02:39:31 UTC (rev 1418)
+++ trunk/src/engine-assuan.c 2009-11-05 12:10:04 UTC (rev 1419)
@@ -240,7 +240,7 @@
goto leave;
assuan_ctx_set_system_hooks (llass->assuan_ctx, &_gpgme_assuan_system_hooks);
- err = assuan_socket_connect (llass->assuan_ctx, file_name, 0);
+ err = assuan_socket_connect (llass->assuan_ctx, file_name, 0, 0);
if (err)
goto leave;
Modified: trunk/src/engine-g13.c
===================================================================
--- trunk/src/engine-g13.c 2009-11-05 02:39:31 UTC (rev 1418)
+++ trunk/src/engine-g13.c 2009-11-05 12:10:04 UTC (rev 1419)
@@ -248,13 +248,13 @@
assuan_ctx_set_system_hooks (g13->assuan_ctx, &_gpgme_assuan_system_hooks);
#if USE_DESCRIPTOR_PASSING
- err = assuan_pipe_connect_ext
+ err = assuan_pipe_connect
(g13->assuan_ctx, file_name ? file_name : _gpgme_get_g13_path (),
- argv, NULL, NULL, NULL, 1);
+ argv, NULL, NULL, NULL, ASSUAN_PIPE_CONNECT_FDPASSING);
#else
err = assuan_pipe_connect
(g13->assuan_ctx, file_name ? file_name : _gpgme_get_g13_path (),
- argv, NULL);
+ argv, NULL, NULL, NULL, 0);
#endif
if (err)
goto leave;
Modified: trunk/src/engine-gpgsm.c
===================================================================
--- trunk/src/engine-gpgsm.c 2009-11-05 02:39:31 UTC (rev 1418)
+++ trunk/src/engine-gpgsm.c 2009-11-05 12:10:04 UTC (rev 1419)
@@ -332,13 +332,13 @@
assuan_ctx_set_system_hooks (gpgsm->assuan_ctx, &_gpgme_assuan_system_hooks);
#if USE_DESCRIPTOR_PASSING
- err = assuan_pipe_connect_ext
+ err = assuan_pipe_connect
(gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (),
- argv, NULL, NULL, NULL, 1);
+ argv, NULL, NULL, NULL, ASSUAN_PIPE_CONNECT_FDPASSING);
#else
err = assuan_pipe_connect
(gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (),
- argv, child_fds);
+ argv, child_fds, NULL, NULL, 0);
/* On Windows, handles are inserted in the spawned process with
DuplicateHandle, and child_fds contains the server-local names