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

- markus@cvs.openbsd.org 2005/01/05 08:51:32 

[sshconnect.c]
     remove dead code, log connect() failures with level error, ok djm@
This commit is contained in:
Darren Tucker 2005-01-20 11:00:46 +11:00
parent 0f38323222
commit b2161e37f5
2 changed files with 7 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -10,6 +10,9 @@
[servconf.c servconf.h sshd.c sshd_config sshd_config.5] [servconf.c servconf.h sshd.c sshd_config sshd_config.5]
bz #898: support AddressFamily in sshd_config. from bz #898: support AddressFamily in sshd_config. from
peak@argo.troja.mff.cuni.cz; ok deraadt@ peak@argo.troja.mff.cuni.cz; ok deraadt@
- markus@cvs.openbsd.org 2005/01/05 08:51:32
[sshconnect.c]
remove dead code, log connect() failures with level error, ok djm@
20050118 20050118
- (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement - (dtucker) [INSTALL Makefile.in configure.ac survey.sh.in] Implement
@ -1982,4 +1985,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM - (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
$Id: ChangeLog,v 1.3611 2005/01/19 23:57:56 dtucker Exp $ $Id: ChangeLog,v 1.3612 2005/01/20 00:00:46 dtucker Exp $

20
sshconnect.c
View File

@ -13,7 +13,7 @@
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: sshconnect.c,v 1.158 2004/06/21 17:36:31 avsm Exp $"); RCSID("$OpenBSD: sshconnect.c,v 1.159 2005/01/05 08:51:32 markus Exp $");
#include <openssl/bn.h> #include <openssl/bn.h>
@ -297,12 +297,6 @@ timeout_connect(int sockfd, const struct sockaddr *serv_addr,
* second). If proxy_command is non-NULL, it specifies the command (with %h * second). If proxy_command is non-NULL, it specifies the command (with %h
* and %p substituted for host and port, respectively) to use to contact * and %p substituted for host and port, respectively) to use to contact
* the daemon. * the daemon.
* Return values:
* 0 for OK
* ECONNREFUSED if we got a "Connection Refused" by the peer on any address
* ECONNABORTED if we failed without a "Connection refused"
* Suitable error messages for the connection failure will already have been
* printed.
*/ */
int int
ssh_connect(const char *host, struct sockaddr_storage * hostaddr, ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
@ -315,12 +309,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
char ntop[NI_MAXHOST], strport[NI_MAXSERV]; char ntop[NI_MAXHOST], strport[NI_MAXSERV];
struct addrinfo hints, *ai, *aitop; struct addrinfo hints, *ai, *aitop;
struct servent *sp; struct servent *sp;
/*
* Did we get only other errors than "Connection refused" (which
* should block fallback to rsh and similar), or did we get at least
* one "Connection refused"?
*/
int full_failure = 1;
debug2("ssh_connect: needpriv %d", needpriv); debug2("ssh_connect: needpriv %d", needpriv);
@ -381,8 +369,6 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen); memcpy(hostaddr, ai->ai_addr, ai->ai_addrlen);
break; break;
} else { } else {
if (errno == ECONNREFUSED)
full_failure = 0;
debug("connect to address %s port %s: %s", debug("connect to address %s port %s: %s",
ntop, strport, strerror(errno)); ntop, strport, strerror(errno));
/* /*
@ -408,9 +394,9 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr,
/* Return failure if we didn't get a successful connection. */ /* Return failure if we didn't get a successful connection. */
if (attempt >= connection_attempts) { if (attempt >= connection_attempts) {
logit("ssh: connect to host %s port %s: %s", error("ssh: connect to host %s port %s: %s",
host, strport, strerror(errno)); host, strport, strerror(errno));
return full_failure ? ECONNABORTED : ECONNREFUSED; return (-1);
} }
debug("Connection established."); debug("Connection established.");