tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

upstream commit 

try harder to preserve errno during
ssh_connect_direct() to make the final error message possibly accurate;
bz#2814, ok dtucker@

OpenBSD-Commit-ID: 57de882cb47381c319b04499fef845dd0c2b46ca
This commit is contained in:
djm@openbsd.org 2018-01-23 05:17:04 +00:00 committed by Damien Miller
parent 9e9c4a7e57
commit 7c77991f5d
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.289 2017/12/06 05:06:21 djm Exp $ */ /* $OpenBSD: sshconnect.c,v 1.290 2018/01/23 05:17:04 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
@ -416,7 +416,7 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,
int connection_attempts, int *timeout_ms, int want_keepalive, int needpriv) int connection_attempts, int *timeout_ms, int want_keepalive, int needpriv)
{ {
int on = 1; int on = 1;
int sock = -1, attempt; int oerrno, sock = -1, attempt;
char ntop[NI_MAXHOST], strport[NI_MAXSERV]; char ntop[NI_MAXHOST], strport[NI_MAXSERV];
struct addrinfo *ai; struct addrinfo *ai;
@ -436,12 +436,16 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,
*/ */
for (ai = aitop; ai; ai = ai->ai_next) { for (ai = aitop; ai; ai = ai->ai_next) {
if (ai->ai_family != AF_INET && if (ai->ai_family != AF_INET &&
ai->ai_family != AF_INET6) ai->ai_family != AF_INET6) {
errno = EAFNOSUPPORT;
continue; continue;
}
if (getnameinfo(ai->ai_addr, ai->ai_addrlen, if (getnameinfo(ai->ai_addr, ai->ai_addrlen,
ntop, sizeof(ntop), strport, sizeof(strport), ntop, sizeof(ntop), strport, sizeof(strport),
NI_NUMERICHOST|NI_NUMERICSERV) != 0) { NI_NUMERICHOST|NI_NUMERICSERV) != 0) {
oerrno = errno;
error("%s: getnameinfo failed", __func__); error("%s: getnameinfo failed", __func__);
errno = oerrno;
continue; continue;
} }
debug("Connecting to %.200s [%.100s] port %s.", debug("Connecting to %.200s [%.100s] port %s.",
@ -451,6 +455,7 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,
sock = ssh_create_socket(needpriv, ai); sock = ssh_create_socket(needpriv, ai);
if (sock < 0) if (sock < 0)
/* Any error is already output */ /* Any error is already output */
errno = 0;
continue; continue;
if (timeout_connect(sock, ai->ai_addr, ai->ai_addrlen, if (timeout_connect(sock, ai->ai_addr, ai->ai_addrlen,
@ -459,10 +464,12 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,
memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen); memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);
break; break;
} else { } else {
oerrno = errno;
debug("connect to address %s port %s: %s", debug("connect to address %s port %s: %s",
ntop, strport, strerror(errno)); ntop, strport, strerror(errno));
close(sock); close(sock);
sock = -1; sock = -1;
errno = oerrno;
} }
} }
if (sock != -1) if (sock != -1)
@ -472,8 +479,8 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop,
/* Return failure if we didn't get a successful connection. */ /* Return failure if we didn't get a successful connection. */
if (sock == -1) { if (sock == -1) {
error("ssh: connect to host %s port %s: %s", error("ssh: connect to host %s port %s: %s",
host, strport, strerror(errno)); host, strport, errno == 0 ? "failure" : strerror(errno));
return (-1); return -1;
} }
debug("Connection established."); debug("Connection established.");