security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-04-17 15:44:34 +02:00
Code Activity

scd: Fix how scdaemon pipe server finishes.

Browse Source 
* 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 <gniibe@fsij.org>
(cherry picked from commit 01fa318be0f8ca60c78d99403fbfb75edb521b16)
This commit is contained in:
NIIBE Yutaka 2024-06-17 11:44:41 +09:00 committed by Werner Koch
parent 76066d71f4
commit 70bb9c5127
No known key found for this signature in database
GPG Key ID: E3FDFF218E45B72B
3 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scd/command.c
View File

@ -2472,9 +2472,8 @@ register_commands (assuan_context_t ctx)
/* Startup the server. If FD is given as -1 this is simple pipe /* Startup the server. If FD is given as -1 this is simple pipe
server, otherwise it is a regular server. Returns true if there server, otherwise it is a regular server. */
are no more active asessions. */ void
int
scd_command_handler (ctrl_t ctrl, gnupg_fd_t fd) scd_command_handler (ctrl_t ctrl, gnupg_fd_t fd)
{ {
int rc; int rc;
@ -2573,9 +2572,6 @@ scd_command_handler (ctrl_t ctrl, gnupg_fd_t fd)
if (stopme) if (stopme)
scd_exit (0); scd_exit (0);
/* If there are no more sessions return true. */
return !session_list;
} }

13
scd/scdaemon.c
View File

@ -249,9 +249,6 @@ static int shutdown_pending;
/* It is possible that we are currently running under setuid permissions */ /* It is possible that we are currently running under setuid permissions */
static int maybe_setuid = 1; static int maybe_setuid = 1;
/* Flag telling whether we are running as a pipe server. */
static int pipe_server;
/* Name of the communication socket */ /* Name of the communication socket */
static char *socket_name; static char *socket_name;
/* Name of the redirected socket or NULL. */ /* Name of the redirected socket or NULL. */
@ -460,6 +457,7 @@ main (int argc, char **argv )
int greeting = 0; int greeting = 0;
int nogreeting = 0; int nogreeting = 0;
int multi_server = 0; int multi_server = 0;
int pipe_server = 0;
int is_daemon = 0; int is_daemon = 0;
int nodetach = 0; int nodetach = 0;
int csh_style = 0; int csh_style = 0;
@ -470,7 +468,6 @@ main (int argc, char **argv )
int allow_coredump = 0; int allow_coredump = 0;
struct assuan_malloc_hooks malloc_hooks; struct assuan_malloc_hooks malloc_hooks;
int res; int res;
npth_t pipecon_handler;
const char *application_priority = NULL; const char *application_priority = NULL;
early_system_init (); early_system_init ();
@ -767,6 +764,7 @@ main (int argc, char **argv )
ctrl_t ctrl; ctrl_t ctrl;
npth_attr_t tattr; npth_attr_t tattr;
gnupg_fd_t fd = GNUPG_INVALID_FD; gnupg_fd_t fd = GNUPG_INVALID_FD;
npth_t pipecon_handler;
#ifndef HAVE_W32_SYSTEM #ifndef HAVE_W32_SYSTEM
{ {
@ -1220,12 +1218,11 @@ start_connection_thread (void *arg)
log_info (_("handler for fd %d started\n"), log_info (_("handler for fd %d started\n"),
FD2INT(ctrl->thread_startup.fd)); FD2INT(ctrl->thread_startup.fd));
/* If this is a pipe server, we request a shutdown if the command /* If this thread is the pipe connection thread, flag that a
handler asked for it. With the next ticker event and given that shutdown is required. With the next ticker event and given that
no other connections are running the shutdown will then no other connections are running the shutdown will then
happen. */ happen. */
if (scd_command_handler (ctrl, ctrl->thread_startup.fd) if (ctrl->thread_startup.fd == GNUPG_INVALID_FD)
&& pipe_server)
shutdown_pending = 1; shutdown_pending = 1;
if (opt.verbose) if (opt.verbose)

2
scd/scdaemon.h
View File

@ -141,7 +141,7 @@ const char *scd_get_socket_name (void);
/*-- command.c --*/ /*-- command.c --*/
gpg_error_t initialize_module_command (void); gpg_error_t initialize_module_command (void);
int scd_command_handler (ctrl_t, gnupg_fd_t); void scd_command_handler (ctrl_t, gnupg_fd_t);
void send_status_info (ctrl_t ctrl, const char *keyword, ...) void send_status_info (ctrl_t ctrl, const char *keyword, ...)
GPGRT_ATTR_SENTINEL(1); GPGRT_ATTR_SENTINEL(1);
gpg_error_t send_status_direct (ctrl_t ctrl, gpg_error_t send_status_direct (ctrl_t ctrl,