security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-02 22:46:30 +02:00
Code Activity

agent,dirmngr: Handle corner case in shutdown mode.

Browse source 
* agent/gpg-agent.c (handle_connections): Keep on selecting on the
inotify fd even when a shutdown is pending.
* dirmngr/dirmngr.c (handle_connections): Ditto.  Also simplifyy the
use of the HAVE_INOTIFY_INIT cpp conditional.
--

Without that patch we won't notice a removed socket when a shutdown is
pending.  This is somewhat related to bug report 2849.

Signed-off-by: Werner Koch <wk@gnupg.org>
This commit is contained in:
Werner Koch 2016-11-29 20:15:47 +01:00
parent 8489b12211
commit 854adc8ae1
No known key found for this signature in database
GPG key ID: E3FDFF218E45B72B
2 changed files with 13 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
agent/gpg-agent.c
View file

@ -2831,6 +2831,12 @@ handle_connections (gnupg_fd_t listen_fd,
/* Do not accept new connections but keep on running the
loop to cope with the timer events. */
FD_ZERO (&fdset);
nfd = -1;
if (my_inotify_fd != -1)
{
FD_SET (my_inotify_fd, &fdset);
nfd = my_inotify_fd;
}
}
/* POSIX says that fd_set should be implemented as a structure,