diff options
| author |   itojun <itojun@openbsd.org> | 2002-06-09 22:17:21 +0000 |
|---|---|---|
| committer | itojun <itojun@openbsd.org> | 2002-06-09 22:17:21 +0000 |
| commit | 99ceaa9dfb75cf9b6145b02efd216f0e340cea39 (patch) | |
| tree | 733145847776be847ba92d2f1d47be01414985e7 /usr.bin/ssh/sshconnect.c | |
| parent | update for no setuid root and ssh-keysign; ok deraadt@ (diff) | |
| download | wireguard-openbsd-99ceaa9dfb75cf9b6145b02efd216f0e340cea39.tar.xz wireguard-openbsd-99ceaa9dfb75cf9b6145b02efd216f0e340cea39.zip | |
pass salen to sockaddr_ntop so that we are happy on linux/solaris
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 8fc0079f090..368100889f1 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -13,7 +13,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: sshconnect.c,v 1.122 2002/06/09 04:33:27 markus Exp $"); +RCSID("$OpenBSD: sshconnect.c,v 1.123 2002/06/09 22:17:21 itojun Exp $"); #include <openssl/bn.h> @@ -40,11 +40,11 @@ extern Options options; extern char *__progname; static const char * -sockaddr_ntop(struct sockaddr *sa) +sockaddr_ntop(struct sockaddr *sa, socklen_t salen) { static char addrbuf[NI_MAXHOST]; - if (getnameinfo(sa, sa->sa_len, addrbuf, sizeof(addrbuf), NULL, 0, + if (getnameinfo(sa, salen, addrbuf, sizeof(addrbuf), NULL, 0, NI_NUMERICHOST) != 0) fatal("sockaddr_ntop: getnameinfo NI_NUMERICHOST failed"); return addrbuf; @@ -314,8 +314,8 @@ ssh_connect(const char *host, struct sockaddr_storage * hostaddr, if (errno == ECONNREFUSED) full_failure = 0; log("ssh: connect to address %s port %s: %s", - sockaddr_ntop(ai->ai_addr), strport, - strerror(errno)); + sockaddr_ntop(ai->ai_addr, ai->ai_addrlen), + strport, strerror(errno)); restore_uid(); /* * Close the failed socket; there appear to |