diff options
| author | NIIBE Yutaka <[email protected]> | 2022-03-31 12:03:13 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2022-03-31 12:03:13 +0000 |
| commit | f584ad95048279b244083fee330c5741be2b9da7 (patch) | |
| tree | 5f690c323251541b47b23b3d9e5caf02a73c0531 /scd/scdaemon.c | |
| parent | dirmngr: Fix for SOCK. (diff) | |
| download | gnupg-f584ad95048279b244083fee330c5741be2b9da7.tar.gz gnupg-f584ad95048279b244083fee330c5741be2b9da7.zip | |
scd,tpm2d: Fix for consistent use of socket FD.
* scd/command.c (scd_command_handler): Use gnupg_fd_t for the argument
but no INT2FD to listen. Use GNUPG_INVALID_FD.
* tpm2d/command.c (tpm2d_command_handler): Likewise.
* scd/scdaemon.c (start_connection_thread): Follow the change.
* tpm2d/tpm2daemon.c (start_connection_thread): Likewise.
* scd/scdaemon.h (scd_command_handler): Use gnupg_fd_t.
* tpm2d/tpm2daemon.h (tpm2d_command_handler): Likewise.
--
Signed-off-by: NIIBE Yutaka <[email protected]>
Diffstat (limited to 'scd/scdaemon.c')
| -rw-r--r-- | scd/scdaemon.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scd/scdaemon.c b/scd/scdaemon.c index d05b8d344..83f24577a 100644 --- a/scd/scdaemon.c +++ b/scd/scdaemon.c @@ -1199,7 +1199,7 @@ start_connection_thread (void *arg) handler asked for it. With the next ticker event and given that no other connections are running the shutdown will then happen. */ - if (scd_command_handler (ctrl, FD2INT(ctrl->thread_startup.fd)) + if (scd_command_handler (ctrl, ctrl->thread_startup.fd) && pipe_server) shutdown_pending = 1; |