diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2001-01-08 22:03:24 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2001-01-08 22:03:24 +0000 |
| commit | 61a54d87e6a830c7042ad1940663c06b7f48e801 (patch) | |
| tree | 86783beb193eb9e448240584f605614fea092075 /usr.bin | |
| parent | 07b40fb01e3ecc52e904872eb91715aead1c9294 (diff) | |
O_NDELAY -> O_NONBLOCK; thanks stevesk@pobox.com
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/ssh/channels.c | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/ssh-keyscan.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/usr.bin/ssh/channels.c b/usr.bin/ssh/channels.c index db477ad655e..de027d0ef9d 100644 --- a/usr.bin/ssh/channels.c +++ b/usr.bin/ssh/channels.c @@ -40,7 +40,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.79 2000/12/29 22:19:13 markus Exp $"); +RCSID("$OpenBSD: channels.c,v 1.80 2001/01/08 22:03:23 markus Exp $"); #include "ssh.h" #include "packet.h" @@ -1737,7 +1737,7 @@ channel_connect_to(const char *host, u_short host_port) error("socket: %.100s", strerror(errno)); continue; } - if (fcntl(sock, F_SETFL, O_NDELAY) < 0) + if (fcntl(sock, F_SETFL, O_NONBLOCK) < 0) fatal("connect_to: F_SETFL: %s", strerror(errno)); /* Connect to the host/port. */ if (connect(sock, ai->ai_addr, ai->ai_addrlen) < 0 && diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index d66df82c5a4..02d56ade245 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -8,7 +8,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-keyscan.c,v 1.6 2000/12/19 23:17:58 markus Exp $"); +RCSID("$OpenBSD: ssh-keyscan.c,v 1.7 2001/01/08 22:03:23 markus Exp $"); #include <sys/queue.h> #include <errno.h> @@ -290,7 +290,7 @@ tcpconnect(char *host) error("socket: %s", strerror(errno)); continue; } - if (fcntl(s, F_SETFL, O_NDELAY) < 0) + if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) fatal("F_SETFL: %s", strerror(errno)); if (connect(s, ai->ai_addr, ai->ai_addrlen) < 0 && errno != EINPROGRESS) |