security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-01-03 12:11:33 +01:00
Code Activity

dirmngr: Fix final close of LISTEN_FD.

Browse Source 
* dirmngr/dirmngr.c (handle_connections): Close LISTEN_FD.

Signed-off-by: NIIBE Yutaka <gniibe@fsij.org>
This commit is contained in:
NIIBE Yutaka 2017-04-18 09:04:11 +09:00
parent 0d0a7efa8f
commit 4b2581dc0e
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dirmngr/dirmngr.c
View File

@ -2046,7 +2046,6 @@ handle_connections (assuan_fd_t listen_fd)
#endif #endif
struct sockaddr_un paddr; struct sockaddr_un paddr;
socklen_t plen = sizeof( paddr ); socklen_t plen = sizeof( paddr );
gnupg_fd_t fd;
int nfd, ret; int nfd, ret;
fd_set fdset, read_fdset; fd_set fdset, read_fdset;
struct timespec abstime; struct timespec abstime;
@ -2190,6 +2189,8 @@ handle_connections (assuan_fd_t listen_fd)
if (FD_ISSET (FD2INT (listen_fd), &read_fdset)) if (FD_ISSET (FD2INT (listen_fd), &read_fdset))
{ {
gnupg_fd_t fd;
plen = sizeof paddr; plen = sizeof paddr;
fd = INT2FD (npth_accept (FD2INT(listen_fd), fd = INT2FD (npth_accept (FD2INT(listen_fd),
(struct sockaddr *)&paddr, &plen)); (struct sockaddr *)&paddr, &plen));
@ -2218,7 +2219,6 @@ handle_connections (assuan_fd_t listen_fd)
} }
npth_setname_np (thread, threadname); npth_setname_np (thread, threadname);
} }
fd = GNUPG_INVALID_FD;
} }
} }
@ -2228,7 +2228,7 @@ handle_connections (assuan_fd_t listen_fd)
#endif /*HAVE_INOTIFY_INIT*/ #endif /*HAVE_INOTIFY_INIT*/
npth_attr_destroy (&tattr); npth_attr_destroy (&tattr);
if (listen_fd != GNUPG_INVALID_FD) if (listen_fd != GNUPG_INVALID_FD)
assuan_sock_close (fd); assuan_sock_close (listen_fd);
cleanup (); cleanup ();
log_info ("%s %s stopped\n", strusage(11), strusage(13)); log_info ("%s %s stopped\n", strusage(11), strusage(13));
} }