diff options
author | djm@openbsd.org <djm@openbsd.org> | 2018-04-09 23:54:49 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-04-10 10:16:36 +1000 |
commit | 260ede2787fe80b18b8d5920455b4fb268519c7d (patch) | |
tree | 8d739b1123558a3357c955dcb2b3f51bafa096b9 /ssh-agent.c | |
parent | ebc8b4656f9b0f834a642a9fb3c9fbca86a61838 (diff) | |
download | openssh-git-260ede2787fe80b18b8d5920455b4fb268519c7d.tar.gz |
upstream: don't kill ssh-agent's listening socket entriely if we
fail to accept a connection; bz#2837, patch from Lukas Kuster
OpenBSD-Commit-ID: 52413f5069179bebf30d38f524afe1a2133c738f
Diffstat (limited to 'ssh-agent.c')
-rw-r--r-- | ssh-agent.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/ssh-agent.c b/ssh-agent.c index 2a4578b0..68de56ce 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.228 2018/02/23 15:58:37 markus Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.229 2018/04/09 23:54:49 djm Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -909,9 +909,8 @@ after_poll(struct pollfd *pfd, size_t npfd) /* Process events */ switch (sockets[socknum].type) { case AUTH_SOCKET: - if ((pfd[i].revents & (POLLIN|POLLERR)) != 0 && - handle_socket_read(socknum) != 0) - close_socket(&sockets[socknum]); + if ((pfd[i].revents & (POLLIN|POLLERR)) != 0) + handle_socket_read(socknum); break; case AUTH_CONNECTION: if ((pfd[i].revents & (POLLIN|POLLERR)) != 0 && |