diff options
| author | NIIBE Yutaka <[email protected]> | 2017-04-18 00:04:11 +0000 |
|---|---|---|
| committer | NIIBE Yutaka <[email protected]> | 2017-04-18 00:04:11 +0000 |
| commit | 4b2581dc0ea1d03e70023bb0748aa0c21c0a2173 (patch) | |
| tree | 5c2cb8262d9035b78676124b8cfc9f4dcbad137a | |
| parent | dirmngr: Fix API difference for Windows. (diff) | |
| download | gnupg-4b2581dc0ea1d03e70023bb0748aa0c21c0a2173.tar.gz gnupg-4b2581dc0ea1d03e70023bb0748aa0c21c0a2173.zip | |
dirmngr: Fix final close of LISTEN_FD.
* dirmngr/dirmngr.c (handle_connections): Close LISTEN_FD.
Signed-off-by: NIIBE Yutaka <[email protected]>
| -rw-r--r-- | dirmngr/dirmngr.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dirmngr/dirmngr.c b/dirmngr/dirmngr.c index 36716c602..8393e0bf3 100644 --- a/dirmngr/dirmngr.c +++ b/dirmngr/dirmngr.c @@ -2046,7 +2046,6 @@ handle_connections (assuan_fd_t listen_fd) #endif struct sockaddr_un paddr; socklen_t plen = sizeof( paddr ); - gnupg_fd_t fd; int nfd, ret; fd_set fdset, read_fdset; struct timespec abstime; @@ -2190,6 +2189,8 @@ handle_connections (assuan_fd_t listen_fd) if (FD_ISSET (FD2INT (listen_fd), &read_fdset)) { + gnupg_fd_t fd; + plen = sizeof paddr; fd = INT2FD (npth_accept (FD2INT(listen_fd), (struct sockaddr *)&paddr, &plen)); @@ -2218,7 +2219,6 @@ handle_connections (assuan_fd_t listen_fd) } npth_setname_np (thread, threadname); } - fd = GNUPG_INVALID_FD; } } @@ -2228,7 +2228,7 @@ handle_connections (assuan_fd_t listen_fd) #endif /*HAVE_INOTIFY_INIT*/ npth_attr_destroy (&tattr); if (listen_fd != GNUPG_INVALID_FD) - assuan_sock_close (fd); + assuan_sock_close (listen_fd); cleanup (); log_info ("%s %s stopped\n", strusage(11), strusage(13)); } |