diff options
| author |   djm <djm@openbsd.org> | 2004-06-14 01:44:38 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2004-06-14 01:44:38 +0000 |
| commit | ff3fa43926265cacf3dfcaee89f87eb6420bc5aa (patch) | |
| tree | 423f16706bf81ca3ad443674872b80823f045b00 /usr.bin/ssh/ssh-agent.c | |
| parent | sync (diff) | |
| download | wireguard-openbsd-ff3fa43926265cacf3dfcaee89f87eb6420bc5aa.tar.xz wireguard-openbsd-ff3fa43926265cacf3dfcaee89f87eb6420bc5aa.zip | |
set_nonblock() instead of fnctl(...,O_NONBLOCK); "looks sane" deraadt@
Diffstat (limited to 'usr.bin/ssh/ssh-agent.c')
| -rw-r--r-- | usr.bin/ssh/ssh-agent.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/usr.bin/ssh/ssh-agent.c b/usr.bin/ssh/ssh-agent.c index 0b4f8b54b78..bca392f84e8 100644 --- a/usr.bin/ssh/ssh-agent.c +++ b/usr.bin/ssh/ssh-agent.c @@ -35,7 +35,7 @@ #include "includes.h" #include <sys/queue.h> -RCSID("$OpenBSD: ssh-agent.c,v 1.118 2004/05/08 00:21:31 djm Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.119 2004/06/14 01:44:39 djm Exp $"); #include <openssl/evp.h> #include <openssl/md5.h> @@ -781,8 +781,7 @@ new_socket(sock_type type, int fd) { u_int i, old_alloc, new_alloc; - if (fcntl(fd, F_SETFL, O_NONBLOCK) < 0) - error("fcntl O_NONBLOCK: %s", strerror(errno)); + set_nonblock(fd); if (fd > max_fd) max_fd = fd; |