From 6a7afbd9a72dcb38feba49782834d648aac5323b Mon Sep 17 00:00:00 2001
From: Markus Friedl <markus@cvs.openbsd.org>
Date: Fri, 26 Sep 2003 08:19:30 +0000
Subject: no need to set the listen sockets to non-block; ok deraadt@

---
 usr.bin/ssh/sshd.c | 12 +-----------
 1 file changed, 1 insertion(+), 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);
-- 
cgit v1.2.3