- 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@

1 files changed, 2 insertions, 3 deletions

diff --git a/ssh-agent.c b/ssh-agent.c
index a38322160..ea84f2196 100644
--- a/ssh-agent.c
+++ b/ssh-agent.c
@@ -35,7 +35,7 @@
 
 #include "includes.h"
 #include "openbsd-compat/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>
@@ -789,8 +789,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;