- (djm) Bug #446: Set LOGIN env var to pw_name on AIX. Patch from

[openssh.git] / canohost.c

diff --git a/canohost.c b/canohost.c
index 8081ed598eab0685726a22c2f8947049a6904c53..9aa942a9f4c51cd6b257184defddbf6d09202fc6 100644 (file)
--- a/canohost.c
+++ b/canohost.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.33 2002/07/09 11:56:27 itojun Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.35 2002/11/26 02:38:54 stevesk Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
@@ -38,7 +38,7 @@ get_remote_hostname(int socket, int verify_reverse_mapping)
        /* Get IP address of client. */
        fromlen = sizeof(from);
        memset(&from, 0, sizeof(from));
-       if (getpeername(socket, (struct sockaddr *) &from, &fromlen) < 0) {
+       if (getpeername(socket, (struct sockaddr *)&from, &fromlen) < 0) {
                debug("getpeername failed: %.100s", strerror(errno));
                fatal_cleanup();
        }
@@ -202,8 +202,8 @@ get_canonical_hostname(int verify_reverse_mapping)
 }
 
 /*
- * Returns the remote IP-address of socket as a string.  The returned
- * string must be freed.
+ * Returns the local/remote IP-address/hostname of socket as a string.
+ * The returned string must be freed.
  */
 static char *
 get_socket_address(int socket, int remote, int flags)
@@ -218,23 +218,17 @@ get_socket_address(int socket, int remote, int flags)
 
        if (remote) {
                if (getpeername(socket, (struct sockaddr *)&addr, &addrlen)
-                   < 0) {
-                       debug("get_socket_ipaddr: getpeername failed: %.100s",
-                           strerror(errno));
+                   < 0)
                        return NULL;
-               }
        } else {
                if (getsockname(socket, (struct sockaddr *)&addr, &addrlen)
-                   < 0) {
-                       debug("get_socket_ipaddr: getsockname failed: %.100s",
-                           strerror(errno));
+                   < 0)
                        return NULL;
-               }
        }
        /* Get the address in ascii. */
        if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop),
            NULL, 0, flags) != 0) {
-               error("get_socket_ipaddr: getnameinfo %d failed", flags);
+               error("get_socket_address: getnameinfo %d failed", flags);
                return NULL;
        }
        return xstrdup(ntop);
@@ -243,13 +237,21 @@ get_socket_address(int socket, int remote, int flags)
 char *
 get_peer_ipaddr(int socket)
 {
-       return get_socket_address(socket, 1, NI_NUMERICHOST);
+       char *p;
+
+       if ((p = get_socket_address(socket, 1, NI_NUMERICHOST)) != NULL)
+               return p;
+       return xstrdup("UNKNOWN");
 }
 
 char *
 get_local_ipaddr(int socket)
 {
-       return get_socket_address(socket, 0, NI_NUMERICHOST);
+       char *p;
+
+       if ((p = get_socket_address(socket, 0, NI_NUMERICHOST)) != NULL)
+               return p;
+       return xstrdup("UNKNOWN");
 }
 
 char *
@@ -312,7 +314,7 @@ get_sock_port(int sock, int local)
                        return 0;
                }
        } else {
-               if (getpeername(sock, (struct sockaddr *) & from, &fromlen) < 0) {
+               if (getpeername(sock, (struct sockaddr *)&from, &fromlen) < 0) {
                        debug("getpeername failed: %.100s", strerror(errno));
                        fatal_cleanup();
                }