diff options
| author | Damien Miller <djm@mindrot.org> | 2004-06-15 10:35:30 +1000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2004-06-15 10:35:30 +1000 |
| commit | 232711f6dbc107711b3957bfa2fd798aec702241 (patch) | |
| tree | 2dfcd276712caa022fd8aa2f3c1319c13660fdd7 /channels.c | |
| parent | 0e220dbfbcc9fe252e8f1f4890dbfa415aad35db (diff) | |
- djm@cvs.openbsd.org 2004/06/14 01:44:39
[channels.c clientloop.c misc.c misc.h packet.c ssh-agent.c ssh-keyscan.c]
[sshd.c]
set_nonblock() instead of fnctl(...,O_NONBLOCK); "looks sane" deraadt@
Diffstat (limited to 'channels.c')
| -rw-r--r-- | channels.c | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -39,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.204 2004/06/13 15:03:02 djm Exp $"); +RCSID("$OpenBSD: channels.c,v 1.205 2004/06/14 01:44:38 djm Exp $"); #include "ssh.h" #include "ssh1.h" @@ -2509,8 +2509,8 @@ connect_to(const char *host, u_short port) verbose("socket: %.100s", strerror(errno)); continue; } - if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) - fatal("connect_to: F_SETFL: %s", strerror(errno)); + if (set_nonblock(sock) == -1) + fatal("%s: set_nonblock(%d)", __func__, sock); if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0 && errno != EINPROGRESS) { error("connect_to %.100s port %s: %.100s", ntop, strport, |