summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2024-10-18 06:14:59 +0200
committerDamien Miller <djm@mindrot.org>2024-10-18 06:15:27 +0200
commita9d6d7d93c533fa729f08b405e786d912553f33e (patch)
tree34c6f1bf06668e36bbe0e36853e5e5d68943caf5
parentupstream: s/Sx/Cm/ for external references; from Domen Puncer (diff)
downloadopenssh-a9d6d7d93c533fa729f08b405e786d912553f33e.tar.xz
openssh-a9d6d7d93c533fa729f08b405e786d912553f33e.zip
upstream: unreachable POLLERR case; from ya0guang via GHPR485
OpenBSD-Commit-ID: b3c82655190532b01eb817e532742cfaa4687eff
-rw-r--r--ssh-keyscan.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/ssh-keyscan.c b/ssh-keyscan.c
index 254e91783..941fa5122 100644
--- a/ssh-keyscan.c
+++ b/ssh-keyscan.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-keyscan.c,v 1.162 2024/09/20 02:00:46 jsg Exp $ */
+/* $OpenBSD: ssh-keyscan.c,v 1.163 2024/10/18 04:14:59 djm Exp $ */
/*
* Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>.
*
@@ -588,7 +588,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|POLLHUP))
+ else if (read_wait[i].revents & (POLLIN))
conread(i);
}