diff options
author | stsp@openbsd.org <stsp@openbsd.org> | 2018-01-23 19:33:49 +0100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-01-24 01:59:01 +0100 |
commit | a60c5dcfa2538ffc94dc5b5adb3db5b6ed905bdb (patch) | |
tree | 0ef567a5c519cee26653824114618adfb3c9f934 | |
parent | rebuild depends (diff) | |
download | openssh-a60c5dcfa2538ffc94dc5b5adb3db5b6ed905bdb.tar.xz openssh-a60c5dcfa2538ffc94dc5b5adb3db5b6ed905bdb.zip |
upstream commit
Add missing braces; fixes 'write: Socket is not
connected' error in ssh. ok deraadt@
OpenBSD-Commit-ID: db73a3a9e147722d410866cac34d43ed52e1ad24
-rw-r--r-- | sshconnect.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sshconnect.c b/sshconnect.c index 0e195a31d..cddf22e1c 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) { |