diff options
| author |   djm <djm@openbsd.org> | 2018-04-09 23:54:49 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2018-04-09 23:54:49 +0000 |
| commit | a04cbf13b6c3a923c287f7daa79e88d533f8540b (patch) | |
| tree | 632a10c5c5a02f30616760b5b285f18611b87af3 /usr.bin/ssh/ssh-agent.c | |
| parent | When accessing an undefined number register, define it to be zero, like (diff) | |
| download | wireguard-openbsd-a04cbf13b6c3a923c287f7daa79e88d533f8540b.tar.xz wireguard-openbsd-a04cbf13b6c3a923c287f7daa79e88d533f8540b.zip | |
don't kill ssh-agent's listening socket entriely if we fail to accept a
connection; bz#2837, patch from Lukas Kuster
Diffstat (limited to 'usr.bin/ssh/ssh-agent.c')
| -rw-r--r-- | usr.bin/ssh/ssh-agent.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index 58d31bff481..55b1827b028 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/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 @@ -894,9 +894,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 && |