aboutsummaryrefslogtreecommitdiffstats
path: root/kbx/kbxserver.c
diff options
context:
space:
mode:
authorNIIBE Yutaka <[email protected]>2023-07-19 04:34:19 +0000
committerNIIBE Yutaka <[email protected]>2023-07-19 04:35:26 +0000
commit6524becf28b134ed7c71001e7fd699dfe0546de8 (patch)
tree58e3dbd148368aba3b0512a64838e3083446a082 /kbx/kbxserver.c
parentcommond: Introduce FD2NUM to express conversion to number of fds. (diff)
downloadgnupg-6524becf28b134ed7c71001e7fd699dfe0546de8.tar.gz
gnupg-6524becf28b134ed7c71001e7fd699dfe0546de8.zip
Revert "kbx,w32: Disable the fd-passing."
This reverts commit 6944aefa3c2ef79cf3f14306ed384d22de36ba7f. -- The fd-passing works well on Windows with new libassuan (to be 3.0), and it doesn't require ASSUAN_SOCKET_SERVER_FDPASSING actually. Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'kbx/kbxserver.c')
-rw-r--r--kbx/kbxserver.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/kbx/kbxserver.c b/kbx/kbxserver.c
index d50b9dfdf..d09a8f8eb 100644
--- a/kbx/kbxserver.c
+++ b/kbx/kbxserver.c
@@ -950,15 +950,9 @@ kbxd_start_command_handler (ctrl_t ctrl, gnupg_fd_t fd, unsigned int session_id)
}
else
{
- /* The fd-passing does not work reliable on Windows, and even it
- * it is not used by gpg and gpgsm the current libassuan slows
- * down things if it is allowed for the server.*/
rc = assuan_init_socket_server (ctx, fd,
(ASSUAN_SOCKET_SERVER_ACCEPTED
-#ifndef HAVE_W32_SYSTEM
- |ASSUAN_SOCKET_SERVER_FDPASSING
-#endif
- ));
+ |ASSUAN_SOCKET_SERVER_FDPASSING));
}
if (rc)