tyler.durden/openssh-portable
1
0
Fork 0
mirror of https://github.com/PowerShell/openssh-portable.git synced 2025-07-31 01:35:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

- markus@cvs.openbsd.org 2003/09/26 08:19:29

Browse Source 
[sshd.c]
     no need to set the listen sockets to non-block; ok deraadt@
This commit is contained in:
Darren Tucker 2003-10-02 16:18:22 +10:00
parent 5dcdd219fb
commit 8fca6b57b4
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -16,6 +16,9 @@
- markus@cvs.openbsd.org 2003/09/23 20:41:11 - markus@cvs.openbsd.org 2003/09/23 20:41:11
[channels.c channels.h clientloop.c] [channels.c channels.h clientloop.c]
move client only agent code to 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 20030930
- (bal) Fix issues in openbsd-compat/realpath.c - (bal) Fix issues in openbsd-compat/realpath.c
@ -1251,4 +1254,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au 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 $

12
sshd.c
View File

@ -42,7 +42,7 @@
*/ */
#include "includes.h" #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/dh.h>
#include <openssl/bn.h> #include <openssl/bn.h>
@ -1136,11 +1136,6 @@ main(int ac, char **av)
verbose("socket: %.100s", strerror(errno)); verbose("socket: %.100s", strerror(errno));
continue; 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. * Set socket options.
* Allow local port reuse in TIME_WAIT. * Allow local port reuse in TIME_WAIT.
@ -1280,11 +1275,6 @@ main(int ac, char **av)
error("accept: %.100s", strerror(errno)); error("accept: %.100s", strerror(errno));
continue; continue;
} }
if (fcntl(newsock, F_SETFL, 0) < 0) {
error("newsock del O_NONBLOCK: %s", strerror(errno));
close(newsock);
continue;
}
if (drop_connection(startups) == 1) { if (drop_connection(startups) == 1) {
debug("drop connection #%d", startups); debug("drop connection #%d", startups);
close(newsock); close(newsock);