From 8fca6b57b488cb2f8cd71186e0f8e17c431f7980 Mon Sep 17 00:00:00 2001 From: Darren Tucker Date: Thu, 2 Oct 2003 16:18:22 +1000 Subject: - markus@cvs.openbsd.org 2003/09/26 08:19:29 [sshd.c] no need to set the listen sockets to non-block; ok deraadt@ --- ChangeLog | 5 ++++- sshd.c | 12 +----------- 2 files changed, 5 insertions(+), 12 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7f7b6f2a5..dc016a4fa 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,6 +16,9 @@ - markus@cvs.openbsd.org 2003/09/23 20:41:11 [channels.c channels.h clientloop.c] move client only agent code to clientloop.c + - markus@cvs.openbsd.org 2003/09/26 08:19:29 + [sshd.c] + no need to set the listen sockets to non-block; ok deraadt@ 20030930 - (bal) Fix issues in openbsd-compat/realpath.c @@ -1251,4 +1254,4 @@ - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. Report from murple@murple.net, diagnosis from dtucker@zip.com.au -$Id: ChangeLog,v 1.3047 2003/10/02 06:17:00 dtucker Exp $ +$Id: ChangeLog,v 1.3048 2003/10/02 06:18:22 dtucker Exp $ diff --git a/sshd.c b/sshd.c index 5c2711295..36f34ff58 100644 --- a/sshd.c +++ b/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 #include @@ -1136,11 +1136,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. @@ -1280,11 +1275,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); -- cgit v1.2.3