mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
Merge branch 'STABLE-BRANCH-2-4' into master
This commit is contained in:
commit
334f5d95c8
89 changed files with 3260 additions and 1400 deletions
|
@ -946,9 +946,15 @@ 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
|
||||
|ASSUAN_SOCKET_SERVER_FDPASSING));
|
||||
#ifndef HAVE_W32_SYSTEM
|
||||
|ASSUAN_SOCKET_SERVER_FDPASSING
|
||||
#endif
|
||||
));
|
||||
}
|
||||
|
||||
if (rc)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue