1 files changed, 6 insertions, 5 deletions

diff --git a/sshconnect.c b/sshconnect.c
index 80b45c79e..dfeddd39e 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -13,7 +13,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: sshconnect.c,v 1.155 2003/12/09 21:53:37 markus Exp $");
+RCSID("$OpenBSD: sshconnect.c,v 1.156 2004/01/25 03:49:09 djm Exp $");
 
 #include <openssl/bn.h>
 
@@ -231,12 +231,12 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
         if (timeout <= 0)
                 return (connect(sockfd, serv_addr, addrlen));
 
-        if (fcntl(sockfd, F_SETFL, O_NONBLOCK) < 0)
-                return (-1);
-
+        set_nonblock(sockfd);
         rc = connect(sockfd, serv_addr, addrlen);
-        if (rc == 0)
+        if (rc == 0) {
+                unset_nonblock(sockfd);
                 return (0);
+        }
         if (errno != EINPROGRESS)
                 return (-1);
 
@@ -277,6 +277,7 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
                         break;
                 }
                 result = 0;
+                unset_nonblock(sockfd);
                 break;
         default:
                 /* Should not occur */