From 6524becf28b134ed7c71001e7fd699dfe0546de8 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Wed, 19 Jul 2023 13:34:19 +0900 Subject: [PATCH] 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 --- kbx/kbxserver.c | 8 +------- 1 file changed, 1 insertion(+), 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)