diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2003-09-26 08:19:30 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2003-09-26 08:19:30 +0000 |
| commit | 6a7afbd9a72dcb38feba49782834d648aac5323b (patch) | |
| tree | cbf3c61c82c0bfc0dba4f84952f6984cf025b98c | |
| parent | 00d69dcf31d86eb7b8d01c40456249cd7341e9cc (diff) | |
no need to set the listen sockets to non-block; ok deraadt@
| -rw-r--r-- | usr.bin/ssh/sshd.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/usr.bin/ssh/sshd.c b/usr.bin/ssh/sshd.c index d58fa816401..6efa23a5537 100644 --- a/usr.bin/ssh/sshd.c +++ b/usr.bin/ssh/sshd.c @@ -42,7 +42,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshd.c,v 1.278 2003/09/23 20:17:11 markus Exp $"); +RCSID("$OpenBSD: sshd.c,v 1.279 2003/09/26 08:19:29 markus Exp $"); #include <openssl/dh.h> #include <openssl/bn.h> @@ -1078,11 +1078,6 @@ main(int ac, char **av) verbose("socket: %.100s", strerror(errno)); continue; } - if (fcntl(listen_sock, F_SETFL, O_NONBLOCK) < 0) { - error("listen_sock O_NONBLOCK: %s", strerror(errno)); - close(listen_sock); - continue; - } /* * Set socket options. * Allow local port reuse in TIME_WAIT. @@ -1221,11 +1216,6 @@ main(int ac, char **av) error("accept: %.100s", strerror(errno)); continue; } - if (fcntl(newsock, F_SETFL, 0) < 0) { - error("newsock del O_NONBLOCK: %s", strerror(errno)); - close(newsock); - continue; - } if (drop_connection(startups) == 1) { debug("drop connection #%d", startups); close(newsock); |