diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | sshd.c | 12 |
2 files changed, 5 insertions, 12 deletions
@@ -16,6 +16,9 @@ | |||
16 | - markus@cvs.openbsd.org 2003/09/23 20:41:11 | 16 | - markus@cvs.openbsd.org 2003/09/23 20:41:11 |
17 | [channels.c channels.h clientloop.c] | 17 | [channels.c channels.h clientloop.c] |
18 | move client only agent code to clientloop.c | 18 | move client only agent code to clientloop.c |
19 | - markus@cvs.openbsd.org 2003/09/26 08:19:29 | ||
20 | [sshd.c] | ||
21 | no need to set the listen sockets to non-block; ok deraadt@ | ||
19 | 22 | ||
20 | 20030930 | 23 | 20030930 |
21 | - (bal) Fix issues in openbsd-compat/realpath.c | 24 | - (bal) Fix issues in openbsd-compat/realpath.c |
@@ -1251,4 +1254,4 @@ | |||
1251 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 1254 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
1252 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 1255 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
1253 | 1256 | ||
1254 | $Id: ChangeLog,v 1.3047 2003/10/02 06:17:00 dtucker Exp $ | 1257 | $Id: ChangeLog,v 1.3048 2003/10/02 06:18:22 dtucker Exp $ |
@@ -42,7 +42,7 @@ | |||
42 | */ | 42 | */ |
43 | 43 | ||
44 | #include "includes.h" | 44 | #include "includes.h" |
45 | RCSID("$OpenBSD: sshd.c,v 1.278 2003/09/23 20:17:11 markus Exp $"); | 45 | RCSID("$OpenBSD: sshd.c,v 1.279 2003/09/26 08:19:29 markus Exp $"); |
46 | 46 | ||
47 | #include <openssl/dh.h> | 47 | #include <openssl/dh.h> |
48 | #include <openssl/bn.h> | 48 | #include <openssl/bn.h> |
@@ -1136,11 +1136,6 @@ main(int ac, char **av) | |||
1136 | verbose("socket: %.100s", strerror(errno)); | 1136 | verbose("socket: %.100s", strerror(errno)); |
1137 | continue; | 1137 | continue; |
1138 | } | 1138 | } |
1139 | if (fcntl(listen_sock, F_SETFL, O_NONBLOCK) < 0) { | ||
1140 | error("listen_sock O_NONBLOCK: %s", strerror(errno)); | ||
1141 | close(listen_sock); | ||
1142 | continue; | ||
1143 | } | ||
1144 | /* | 1139 | /* |
1145 | * Set socket options. | 1140 | * Set socket options. |
1146 | * Allow local port reuse in TIME_WAIT. | 1141 | * Allow local port reuse in TIME_WAIT. |
@@ -1280,11 +1275,6 @@ main(int ac, char **av) | |||
1280 | error("accept: %.100s", strerror(errno)); | 1275 | error("accept: %.100s", strerror(errno)); |
1281 | continue; | 1276 | continue; |
1282 | } | 1277 | } |
1283 | if (fcntl(newsock, F_SETFL, 0) < 0) { | ||
1284 | error("newsock del O_NONBLOCK: %s", strerror(errno)); | ||
1285 | close(newsock); | ||
1286 | continue; | ||
1287 | } | ||
1288 | if (drop_connection(startups) == 1) { | 1278 | if (drop_connection(startups) == 1) { |
1289 | debug("drop connection #%d", startups); | 1279 | debug("drop connection #%d", startups); |
1290 | close(newsock); | 1280 | close(newsock); |