summaryrefslogtreecommitdiffstats
path: root/ssh-keyscan.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2021-11-18 03:31:44 +0000
committerDamien Miller <djm@mindrot.org>2021-11-18 14:32:54 +1100
commit875408270c5a7dd69ed5449e5d85bd7120c88f70 (patch)
treefff5263529b40a4799260135b1c06197d22e1771 /ssh-keyscan.c
parent36b5e37030d35bbaa18ba56825b1af55971d18a0 (diff)
upstream: check for POLLHUP wherever we check for POLLIN
Diffstat (limited to 'ssh-keyscan.c')
-rw-r--r--ssh-keyscan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index b0c530f3..ccd21258 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.142 2021/11/12 05:23:49 deraadt Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.143 2021/11/18 03:31:44 djm Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
@@ -597,7 +597,7 @@ conloop(void)
for (i = 0; i < maxfd; i++) {
if (read_wait[i].revents & (POLLHUP|POLLERR|POLLNVAL))
confree(i);
- else if (read_wait[i].revents & POLLIN)
+ else if (read_wait[i].revents & (POLLIN|POLLHUP))
conread(i);
}