From 728aa7e18c378ce990aa3419917c665181904ba8 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Mon, 15 Jul 2002 17:48:11 +0000 Subject: - itojun@cvs.openbsd.org 2002/07/12 13:29:09 [sshconnect.c] print connect failure during debugging mode. --- ChangeLog | 8 +++++++- sshconnect.c | 17 +++-------------- 2 files changed, 10 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index f60d926f3..2c765c7e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +20020715 + - (bal) OpenBSD CVS Sync + - itojun@cvs.openbsd.org 2002/07/12 13:29:09 + [sshconnect.c] + print connect failure during debugging mode. + 20020714 - (tim) [Makefile.in] replace "id sshd" with "sshd -t" - (bal/tim) [acconfig.h configure.ac monitor_mm.c servconf.c @@ -1361,4 +1367,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2366 2002/07/14 22:50:51 tim Exp $ +$Id: ChangeLog,v 1.2367 2002/07/15 17:48:11 mouring Exp $ diff --git a/sshconnect.c b/sshconnect.c index ae6c5f32b..9f8458dc7 100644 --- a/sshconnect.c +++ b/sshconnect.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.130 2002/07/10 10:28:15 itojun Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.131 2002/07/12 13:29:09 itojun Exp $"); #include @@ -46,19 +46,6 @@ extern uid_t original_effective_uid; #define INET6_ADDRSTRLEN 46 #endif -#if 0 -static const char * -sockaddr_ntop(struct sockaddr *sa, socklen_t salen) -{ - static char addrbuf[NI_MAXHOST]; - - if (getnameinfo(sa, salen, addrbuf, sizeof(addrbuf), NULL, 0, - NI_NUMERICHOST) != 0) - fatal("sockaddr_ntop: getnameinfo NI_NUMERICHOST failed"); - return addrbuf; -} -#endif - /* * Connect to the given ssh server using a proxy command. */ @@ -309,6 +296,8 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, } else { if (errno == ECONNREFUSED) full_failure = 0; + debug("connect to address %s port %s: %s", + ntop, strport, strerror(errno)); /* * Close the failed socket; there appear to * be some problems when reusing a socket for -- cgit v1.2.3