summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorstsp@openbsd.org <stsp@openbsd.org>2018-01-23 18:33:49 +0000
committerDamien Miller <djm@mindrot.org>2018-01-24 11:59:01 +1100
commita60c5dcfa2538ffc94dc5b5adb3db5b6ed905bdb (patch)
tree0ef567a5c519cee26653824114618adfb3c9f934
parent20d53ac283e1c60245ea464bdedd015ed9b38f4a (diff)
upstream commit
Add missing braces; fixes 'write: Socket is not connected' error in ssh. ok deraadt@ OpenBSD-Commit-ID: db73a3a9e147722d410866cac34d43ed52e1ad24
-rw-r--r--sshconnect.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c
index 0e195a31..cddf22e1 100644
--- a/sshconnect.c
+++ b/sshconnect.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: sshconnect.c,v 1.291 2018/01/23 05:27:21 djm Exp $ */
+/* $OpenBSD: sshconnect.c,v 1.292 2018/01/23 18:33:49 stsp Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@@ -453,10 +453,11 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,
/* Create a socket for connecting. */
sock = ssh_create_socket(needpriv, ai);
- if (sock < 0)
+ if (sock < 0) {
/* Any error is already output */
errno = 0;
continue;
+ }
if (timeout_connect(sock, ai->ai_addr, ai->ai_addrlen,
timeout_ms) >= 0) {