diff options
Diffstat (limited to 'kbx/kbx-client-util.c')
| -rw-r--r-- | kbx/kbx-client-util.c | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/kbx/kbx-client-util.c b/kbx/kbx-client-util.c index b900586c8..e7b5a6b7d 100644 --- a/kbx/kbx-client-util.c +++ b/kbx/kbx-client-util.c @@ -30,6 +30,7 @@ #include "../common/membuf.h" #include "../common/i18n.h" #include "../common/asshelp.h" +#include "../common/sysutils.h" #include "../common/exechelp.h" #include "../common/sysutils.h" #include "../common/host2net.h" @@ -102,7 +103,7 @@ prepare_data_pipe (kbx_client_data_t kcd) { gpg_error_t err; int rc; - int inpipe[2]; + gnupg_fd_t inpipe; estream_t infp; npth_attr_t tattr; @@ -111,24 +112,29 @@ prepare_data_pipe (kbx_client_data_t kcd) kcd->datalen = 0; kcd->dataerr = 0; - err = gnupg_create_inbound_pipe (inpipe, &infp, 0); + err = gnupg_create_inbound_pipe (&inpipe, &infp, 0); if (err) { log_error ("error creating inbound pipe: %s\n", gpg_strerror (err)); return err; /* That should not happen. */ } -#ifdef HAVE_W32_SYSTEM - err = assuan_sendfd (kcd->ctx, (HANDLE)_get_osfhandle (inpipe[1])); -#else - err = assuan_sendfd (kcd->ctx, inpipe[1]); -#endif + err = assuan_sendfd (kcd->ctx, inpipe); if (err) { +#ifdef HAVE_W32_SYSTEM + log_error ("sending fd %p to keyboxd: %s <%s>\n", + inpipe, gpg_strerror (err), gpg_strsource (err)); +#else log_error ("sending fd %d to keyboxd: %s <%s>\n", - inpipe[1], gpg_strerror (err), gpg_strsource (err)); + inpipe, gpg_strerror (err), gpg_strsource (err)); +#endif es_fclose (infp); - gnupg_close_pipe (inpipe[1]); +#ifdef HAVE_W32_SYSTEM + CloseHandle (inpipe); +#else + close (inpipe); +#endif return err; } @@ -142,7 +148,11 @@ prepare_data_pipe (kbx_client_data_t kcd) return err; } - close (inpipe[1]); +#ifdef HAVE_W32_SYSTEM + CloseHandle (inpipe); +#else + close (inpipe); +#endif kcd->fp = infp; rc = npth_attr_init (&tattr); |