2009-11-05 Marcus Brinkmann <marcus@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.

diff --git a/src/ChangeLog b/src/ChangeLog
index 0ea3a1c349253f3a826cbe1dd6d54b1719552514..1fe09919d785c316b6328a336413e0874b069cfa 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,9 @@
 2009-11-05  Marcus Brinkmann  <marcus@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.

diff --git a/src/engine-assuan.c b/src/engine-assuan.c
index 38fb1adb458c48b3bcbe70c4352fc7293005b217..cd722cf0ea63b5f35e41a0811d4d6ff7d71aaf02 100644 (file)
--- a/src/engine-assuan.c
+++ b/src/engine-assuan.c
@@ -240,7 +240,7 @@ llass_new (void **engine, const char *file_name, const char *home_dir)
     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;
 

diff --git a/src/engine-g13.c b/src/engine-g13.c
index 34c6ac1614cda0917218d01d8b8c8fbd1e10fb53..8ecdcdfe6e9a4bd314d7ca1f3635622e791a9fbf 100644 (file)
--- a/src/engine-g13.c
+++ b/src/engine-g13.c
@@ -248,13 +248,13 @@ g13_new (void **engine, const char *file_name, const char *home_dir)
   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;

diff --git a/src/engine-gpgsm.c b/src/engine-gpgsm.c
index 04f49ed9036768154ae7b50b68eb0ab3d461c4be..87d577bdf9b5c032b02910b03eb13f6ab3297821 100644 (file)
--- a/src/engine-gpgsm.c
+++ b/src/engine-gpgsm.c
@@ -332,13 +332,13 @@ gpgsm_new (void **engine, const char *file_name, const char *home_dir)
   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