diff options
-rw-r--r-- | sshconnect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sshconnect.c b/sshconnect.c index 740780443..bcb732a32 100644 --- a/sshconnect.c +++ b/sshconnect.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshconnect.c,v 1.318 2019/09/13 04:27:35 djm Exp $ */ | 1 | /* $OpenBSD: sshconnect.c,v 1.319 2019/09/13 04:31:19 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> | 3 | * Author: Tatu Ylonen <ylo@cs.hut.fi> |
4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland | 4 | * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland |
@@ -543,7 +543,7 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop, | |||
543 | if (ssh_packet_set_connection(ssh, sock, sock) == NULL) | 543 | if (ssh_packet_set_connection(ssh, sock, sock) == NULL) |
544 | return -1; /* ssh_packet_set_connection logs error */ | 544 | return -1; /* ssh_packet_set_connection logs error */ |
545 | 545 | ||
546 | return 0; | 546 | return 0; |
547 | } | 547 | } |
548 | 548 | ||
549 | int | 549 | int |
@@ -794,7 +794,7 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, | |||
794 | ip_status = check_key_in_hostkeys(ip_hostkeys, host_key, | 794 | ip_status = check_key_in_hostkeys(ip_hostkeys, host_key, |
795 | &ip_found); | 795 | &ip_found); |
796 | if (host_status == HOST_CHANGED && | 796 | if (host_status == HOST_CHANGED && |
797 | (ip_status != HOST_CHANGED || | 797 | (ip_status != HOST_CHANGED || |
798 | (ip_found != NULL && | 798 | (ip_found != NULL && |
799 | !sshkey_equal(ip_found->key, host_found->key)))) | 799 | !sshkey_equal(ip_found->key, host_found->key)))) |
800 | host_ip_differ = 1; | 800 | host_ip_differ = 1; |