- itojun@cvs.openbsd.org 2002/06/09 22:17:21

     [sshconnect.c]
     pass salen to sockaddr_ntop so that we are happy on linux/solaris

diff --git a/ChangeLog b/ChangeLog
index c6f2bd69e704237933c93fa64e507e5431fa2c1c..2a8f3a11000883eb245a50af9889259ada7312c1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@
    - stevesk@cvs.openbsd.org 2002/06/09 22:15:15
      [ssh.1]
      update for no setuid root and ssh-keysign; ok deraadt@
+   - itojun@cvs.openbsd.org 2002/06/09 22:17:21
+     [sshconnect.c]
+     pass salen to sockaddr_ntop so that we are happy on linux/solaris
 
 20020609
  - (bal) OpenBSD CVS Sync

diff --git a/sshconnect.c b/sshconnect.c
index 369b31dfedee9760fcaf1472d030103b0c7a5555..651e3fcf4c6f6e40086aeab35d8725f906d68537 100644 (file)
--- a/sshconnect.c
+++ b/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>
 
@@ -44,11 +44,11 @@ extern char *__progname;
 #endif
 
 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;
@@ -322,8 +322,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