summaryrefslogtreecommitdiffstats
path: root/usr.bin/ssh/sshconnect.c
diff options
context:
space:
mode:
authorstsp <stsp@openbsd.org>2018-01-23 18:33:49 +0000
committerstsp <stsp@openbsd.org>2018-01-23 18:33:49 +0000
commite199612de1c40ad98e8ec52a0038c1566c3413a3 (patch)
tree8579f7c4ce07e7b96f9ec67d9618facc37627bdf /usr.bin/ssh/sshconnect.c
parentuse END_STRONG. Yes, everything in the sh ecosystem is different.. (diff)
downloadwireguard-openbsd-e199612de1c40ad98e8ec52a0038c1566c3413a3.tar.xz
wireguard-openbsd-e199612de1c40ad98e8ec52a0038c1566c3413a3.zip
Add missing braces; fixes 'write: Socket is not connected' error in ssh.
ok deraadt@
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
-rw-r--r--usr.bin/ssh/sshconnect.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c
index 28f49065110..f759df1a25e 100644
--- a/usr.bin/ssh/sshconnect.c
+++ b/usr.bin/ssh/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
@@ -441,10 +441,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) {