Import of OpenSSH 3.1p1

[gssapi-openssh.git] / openssh / canohost.c

diff --git a/openssh/canohost.c b/openssh/canohost.c
index 6e6a04505e97c2244342baca4cd8a81aed33975c..03005aa29c8c9da023f2d90406987e77602f3bcd 100644 (file)
--- a/openssh/canohost.c
+++ b/openssh/canohost.c
@@ -12,7 +12,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: canohost.c,v 1.27 2001/06/23 15:12:17 itojun Exp $");
+RCSID("$OpenBSD: canohost.c,v 1.31 2002/02/27 21:23:13 stevesk Exp $");
 
 #include "packet.h"
 #include "xmalloc.h"
@@ -27,7 +27,7 @@ static void check_ip_options(int, char *);
  */
 
 static char *
-get_remote_hostname(int socket, int reverse_mapping_check)
+get_remote_hostname(int socket, int verify_reverse_mapping)
 {
        struct sockaddr_storage from;
        int i;
@@ -68,13 +68,13 @@ get_remote_hostname(int socket, int reverse_mapping_check)
                check_ip_options(socket, ntop);
 
        if (getnameinfo((struct sockaddr *)&from, fromlen, ntop, sizeof(ntop),
-            NULL, 0, NI_NUMERICHOST) != 0)
+           NULL, 0, NI_NUMERICHOST) != 0)
                fatal("get_remote_hostname: getnameinfo NI_NUMERICHOST failed");
 
        debug3("Trying to reverse map address %.100s.", ntop);
        /* Map the IP address to a host name. */
        if (getnameinfo((struct sockaddr *)&from, fromlen, name, sizeof(name),
-            NULL, 0, NI_NAMEREQD) != 0) {
+           NULL, 0, NI_NAMEREQD) != 0) {
                /* Host name not found.  Use ip address. */
                log("Could not reverse map address %.100s.", ntop);
                return xstrdup(ntop);
@@ -90,7 +90,7 @@ get_remote_hostname(int socket, int reverse_mapping_check)
                if (isupper(name[i]))
                        name[i] = tolower(name[i]);
 
-       if (!reverse_mapping_check)
+       if (!verify_reverse_mapping)
                return xstrdup(name);
        /*
         * Map it back to an IP address and check that the given
@@ -154,7 +154,7 @@ check_ip_options(int socket, char *ipaddr)
        else
                ipproto = IPPROTO_IP;
        option_size = sizeof(options);
-       if (getsockopt(socket, ipproto, IP_OPTIONS, (void *)options,
+       if (getsockopt(socket, ipproto, IP_OPTIONS, options,
            &option_size) >= 0 && option_size != 0) {
                text[0] = '\0';
                for (i = 0; i < option_size; i++)
@@ -174,14 +174,14 @@ check_ip_options(int socket, char *ipaddr)
  */
 
 const char *
-get_canonical_hostname(int reverse_mapping_check)
+get_canonical_hostname(int verify_reverse_mapping)
 {
        static char *canonical_host_name = NULL;
-       static int reverse_mapping_checked = 0;
+       static int verify_reverse_mapping_done = 0;
 
        /* Check if we have previously retrieved name with same option. */
        if (canonical_host_name != NULL) {
-               if (reverse_mapping_checked != reverse_mapping_check)
+               if (verify_reverse_mapping_done != verify_reverse_mapping)
                        xfree(canonical_host_name);
                else
                        return canonical_host_name;
@@ -190,11 +190,11 @@ get_canonical_hostname(int reverse_mapping_check)
        /* Get the real hostname if socket; otherwise return UNKNOWN. */
        if (packet_connection_is_on_socket())
                canonical_host_name = get_remote_hostname(
-                   packet_get_connection_in(), reverse_mapping_check);
+                   packet_get_connection_in(), verify_reverse_mapping);
        else
                canonical_host_name = xstrdup("UNKNOWN");
 
-       reverse_mapping_checked = reverse_mapping_check;
+       verify_reverse_mapping_done = verify_reverse_mapping;
        return canonical_host_name;
 }
 
@@ -230,7 +230,7 @@ get_socket_address(int socket, int remote, int flags)
        }
        /* Get the address in ascii. */
        if (getnameinfo((struct sockaddr *)&addr, addrlen, ntop, sizeof(ntop),
-            NULL, 0, flags) != 0) {
+           NULL, 0, flags) != 0) {
                error("get_socket_ipaddr: getnameinfo %d failed", flags);
                return NULL;
        }
@@ -261,7 +261,7 @@ get_local_name(int socket)
  */
 
 const char *
-get_remote_ipaddr()
+get_remote_ipaddr(void)
 {
        static char *canonical_host_ip = NULL;
 
@@ -281,11 +281,11 @@ get_remote_ipaddr()
 }
 
 const char *
-get_remote_name_or_ip(u_int utmp_len, int reverse_mapping_check)
+get_remote_name_or_ip(u_int utmp_len, int verify_reverse_mapping)
 {
        static const char *remote = "";
        if (utmp_len > 0)
-               remote = get_canonical_hostname(reverse_mapping_check);
+               remote = get_canonical_hostname(verify_reverse_mapping);
        if (utmp_len == 0 || strlen(remote) > utmp_len)
                remote = get_remote_ipaddr();
        return remote;
@@ -316,7 +316,7 @@ get_sock_port(int sock, int local)
        }
        /* Return port number. */
        if (getnameinfo((struct sockaddr *)&from, fromlen, NULL, 0,
-            strport, sizeof(strport), NI_NUMERICSERV) != 0)
+           strport, sizeof(strport), NI_NUMERICSERV) != 0)
                fatal("get_sock_port: getnameinfo NI_NUMERICSERV failed");
        return atoi(strport);
 }
@@ -344,13 +344,13 @@ get_peer_port(int sock)
 }
 
 int
-get_remote_port()
+get_remote_port(void)
 {
        return get_port(0);
 }
 
 int
-get_local_port()
+get_local_port(void)
 {
        return get_port(1);
 }