diff options
Diffstat (limited to '')
| -rw-r--r-- | agent/gpg-agent.c | 6 | ||||
| -rw-r--r-- | dirmngr/dirmngr.c | 12 |
2 files changed, 13 insertions, 5 deletions
diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c index 5060c07a1..c2052c9ab 100644 --- a/agent/gpg-agent.c +++ b/agent/gpg-agent.c @@ -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, diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index f60173b8c..748f30991 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -1942,9 +1942,7 @@ handle_connections (assuan_fd_t listen_fd) struct timespec curtime; struct timespec timeout; int saved_errno; -#ifdef HAVE_INOTIFY_INIT - int my_inotify_fd; -#endif /*HAVE_INOTIFY_INIT*/ + int my_inotify_fd = -1; npth_attr_init (&tattr); npth_attr_setdetachstate (&tattr, NPTH_CREATE_DETACHED); @@ -1988,14 +1986,12 @@ handle_connections (assuan_fd_t listen_fd) FD_ZERO (&fdset); FD_SET (FD2INT (listen_fd), &fdset); nfd = FD2INT (listen_fd); -#ifdef HAVE_INOTIFY_INIT if (my_inotify_fd != -1) { FD_SET (my_inotify_fd, &fdset); if (my_inotify_fd > nfd) nfd = my_inotify_fd; } -#endif /*HAVE_INOTIFY_INIT*/ npth_clock_gettime (&abstime); abstime.tv_sec += TIMERTICK_INTERVAL; @@ -2012,6 +2008,12 @@ handle_connections (assuan_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; + } } /* Take a copy of the fdset. */ |