diff options
Diffstat (limited to 'scd')
| -rw-r--r-- | scd/command.c | 6 | ||||
| -rw-r--r-- | scd/scdaemon.c | 2 | ||||
| -rw-r--r-- | scd/scdaemon.h | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/scd/command.c b/scd/command.c index 10f5a2fe1..bc2e1f979 100644 --- a/scd/command.c +++ b/scd/command.c @@ -2454,7 +2454,7 @@ register_commands (assuan_context_t ctx) server, otherwise it is a regular server. Returns true if there are no more active asessions. */ int -scd_command_handler (ctrl_t ctrl, int fd) +scd_command_handler (ctrl_t ctrl, gnupg_fd_t fd) { int rc; assuan_context_t ctx = NULL; @@ -2468,7 +2468,7 @@ scd_command_handler (ctrl_t ctrl, int fd) scd_exit (2); } - if (fd == -1) + if (fd == GNUPG_INVALID_FD) { assuan_fd_t filedes[2]; @@ -2478,7 +2478,7 @@ scd_command_handler (ctrl_t ctrl, int fd) } else { - rc = assuan_init_socket_server (ctx, INT2FD(fd), + rc = assuan_init_socket_server (ctx, fd, ASSUAN_SOCKET_SERVER_ACCEPTED); } if (rc) 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; diff --git a/scd/scdaemon.h b/scd/scdaemon.h index 096a4b9e2..071960c6c 100644 --- a/scd/scdaemon.h +++ b/scd/scdaemon.h @@ -130,7 +130,7 @@ const char *scd_get_socket_name (void); /*-- command.c --*/ gpg_error_t initialize_module_command (void); -int scd_command_handler (ctrl_t, int); +int scd_command_handler (ctrl_t, gnupg_fd_t); void send_status_info (ctrl_t ctrl, const char *keyword, ...) GPGRT_ATTR_SENTINEL(1); gpg_error_t send_status_direct (ctrl_t ctrl, |