GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2009-11-05 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* 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.
This commit is contained in:
Marcus Brinkmann 2009-11-05 12:10:04 +00:00
parent 59dc98545a
commit 4babea46e7
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,5 +1,9 @@
2009-11-05 Marcus Brinkmann <marcus@g10code.de> 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. * priv-io.h (IOSPAWN_FLAG_NOCLOSE): New flag.
* w32-io.c (_gpgme_io_spawn): Implement this flag. * w32-io.c (_gpgme_io_spawn): Implement this flag.
* posix-io.c (_gpgme_io_spawn): Likewise. * posix-io.c (_gpgme_io_spawn): Likewise.

2
src/engine-assuan.c
View File

@ -240,7 +240,7 @@ llass_new (void **engine, const char *file_name, const char *home_dir)
goto leave; goto leave;
assuan_ctx_set_system_hooks (llass->assuan_ctx, &_gpgme_assuan_system_hooks); 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) if (err)
goto leave; goto leave;

6
src/engine-g13.c
View File

@ -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); assuan_ctx_set_system_hooks (g13->assuan_ctx, &_gpgme_assuan_system_hooks);
#if USE_DESCRIPTOR_PASSING #if USE_DESCRIPTOR_PASSING
err = assuan_pipe_connect_ext err = assuan_pipe_connect
(g13->assuan_ctx, file_name ? file_name : _gpgme_get_g13_path (), (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 #else
err = assuan_pipe_connect err = assuan_pipe_connect
(g13->assuan_ctx, file_name ? file_name : _gpgme_get_g13_path (), (g13->assuan_ctx, file_name ? file_name : _gpgme_get_g13_path (),
argv, NULL); argv, NULL, NULL, NULL, 0);
#endif #endif
if (err) if (err)
goto leave; goto leave;

6
src/engine-gpgsm.c
View File

@ -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); assuan_ctx_set_system_hooks (gpgsm->assuan_ctx, &_gpgme_assuan_system_hooks);
#if USE_DESCRIPTOR_PASSING #if USE_DESCRIPTOR_PASSING
err = assuan_pipe_connect_ext err = assuan_pipe_connect
(gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (), (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 #else
err = assuan_pipe_connect err = assuan_pipe_connect
(gpgsm->assuan_ctx, file_name ? file_name : _gpgme_get_gpgsm_path (), (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 /* On Windows, handles are inserted in the spawned process with
DuplicateHandle, and child_fds contains the server-local names DuplicateHandle, and child_fds contains the server-local names