diff options
Diffstat (limited to 'sshconnect.c')
-rw-r--r-- | sshconnect.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sshconnect.c b/sshconnect.c index fb6af67df..068c23072 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "includes.h" | 10 | #include "includes.h" |
11 | RCSID("$Id: sshconnect.c,v 1.21 2000/01/14 04:45:52 damien Exp $"); | 11 | RCSID("$Id: sshconnect.c,v 1.22 2000/01/19 02:45:07 damien Exp $"); |
12 | 12 | ||
13 | #ifdef HAVE_OPENSSL | 13 | #ifdef HAVE_OPENSSL |
14 | #include <openssl/bn.h> | 14 | #include <openssl/bn.h> |
@@ -1070,7 +1070,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, RSA *host_key) | |||
1070 | HostStatus host_status; | 1070 | HostStatus host_status; |
1071 | HostStatus ip_status; | 1071 | HostStatus ip_status; |
1072 | int local = 0, host_ip_differ = 0; | 1072 | int local = 0, host_ip_differ = 0; |
1073 | int sa_len; | 1073 | int salen; |
1074 | char ntop[NI_MAXHOST]; | 1074 | char ntop[NI_MAXHOST]; |
1075 | 1075 | ||
1076 | /* | 1076 | /* |
@@ -1084,15 +1084,15 @@ check_host_key(char *host, struct sockaddr *hostaddr, RSA *host_key) | |||
1084 | switch (hostaddr->sa_family) { | 1084 | switch (hostaddr->sa_family) { |
1085 | case AF_INET: | 1085 | case AF_INET: |
1086 | local = (ntohl(((struct sockaddr_in *)hostaddr)->sin_addr.s_addr) >> 24) == IN_LOOPBACKNET; | 1086 | local = (ntohl(((struct sockaddr_in *)hostaddr)->sin_addr.s_addr) >> 24) == IN_LOOPBACKNET; |
1087 | sa_len = sizeof(struct sockaddr_in); | 1087 | salen = sizeof(struct sockaddr_in); |
1088 | break; | 1088 | break; |
1089 | case AF_INET6: | 1089 | case AF_INET6: |
1090 | local = IN6_IS_ADDR_LOOPBACK(&(((struct sockaddr_in6 *)hostaddr)->sin6_addr)); | 1090 | local = IN6_IS_ADDR_LOOPBACK(&(((struct sockaddr_in6 *)hostaddr)->sin6_addr)); |
1091 | sa_len = sizeof(struct sockaddr_in6); | 1091 | salen = sizeof(struct sockaddr_in6); |
1092 | break; | 1092 | break; |
1093 | default: | 1093 | default: |
1094 | local = 0; | 1094 | local = 0; |
1095 | sa_len = sizeof(struct sockaddr_storage); | 1095 | salen = sizeof(struct sockaddr_storage); |
1096 | break; | 1096 | break; |
1097 | } | 1097 | } |
1098 | if (local) { | 1098 | if (local) { |
@@ -1108,7 +1108,7 @@ check_host_key(char *host, struct sockaddr *hostaddr, RSA *host_key) | |||
1108 | options.check_host_ip = 0; | 1108 | options.check_host_ip = 0; |
1109 | 1109 | ||
1110 | if (options.check_host_ip) { | 1110 | if (options.check_host_ip) { |
1111 | if (getnameinfo(hostaddr, sa_len, ntop, sizeof(ntop), | 1111 | if (getnameinfo(hostaddr, salen, ntop, sizeof(ntop), |
1112 | NULL, 0, NI_NUMERICHOST) != 0) | 1112 | NULL, 0, NI_NUMERICHOST) != 0) |
1113 | fatal("check_host_key: getnameinfo failed"); | 1113 | fatal("check_host_key: getnameinfo failed"); |
1114 | ip = xstrdup(ntop); | 1114 | ip = xstrdup(ntop); |