From 01fa318be0f8ca60c78d99403fbfb75edb521b16 Mon Sep 17 00:00:00 2001 From: NIIBE Yutaka Date: Mon, 17 Jun 2024 11:44:41 +0900 Subject: scd: Fix how scdaemon pipe server finishes. * scd/scdaemon.h (scd_command_handler): Fix the return type. * scd/command.c (scd_command_handler): Not return a value. * scd/scdaemon.c (pipe_server): Make it auto variable in main. (main): Use auto PIPE_SERVER variable. (start_connection_thread): When it's a pipe connection and it finishes, let the service shutdown. -- GnuPG-bug-id: 7151 Signed-off-by: NIIBE Yutaka --- scd/command.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'scd/command.c') diff --git a/scd/command.c b/scd/command.c index 97e6accff..6e1a6e223 100644 --- a/scd/command.c +++ b/scd/command.c @@ -2475,9 +2475,8 @@ register_commands (assuan_context_t ctx) /* Startup the server. If FD is given as -1 this is simple pipe - server, otherwise it is a regular server. Returns true if there - are no more active asessions. */ -int + server, otherwise it is a regular server. */ +void scd_command_handler (ctrl_t ctrl, gnupg_fd_t fd) { int rc; @@ -2576,9 +2575,6 @@ scd_command_handler (ctrl_t ctrl, gnupg_fd_t fd) if (stopme) scd_exit (0); - - /* If there are no more sessions return true. */ - return !session_list; } -- cgit v1.2.3