commit f6723f08e0b54e00f988f58ff0f1d4d8575ee7bd
author Damien Miller <djm@mindrot.org> Tue Jan 27 21:21:27 2004 +1100
committer Damien Miller <djm@mindrot.org> Tue Jan 27 21:21:27 2004 +1100
tree ecf3a57e09cb4594296a63588bd93b54fe6aa004
parent b2d1c2b3b82fbbd78ed3dce8e26a3e70fb1b9165

   - djm@cvs.openbsd.org 2004/01/25 03:49:09
     [sshconnect.c]
     reset nonblocking flag after ConnectTimeout > 0 connect; (bugzilla #785)
     from jclonguet AT free.fr; ok millert@

sshconnect.c

diff --git a/sshconnect.c b/sshconnect.c
index 80b45c7..dfeddd3 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 @@
 	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 @@
 			break;
 		}
 		result = 0;
+		unset_nonblock(sockfd);
 		break;
 	default:
 		/* Should not occur */