RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-02-06 17:11:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: whitespace

Browse Source 
OpenBSD-Commit-ID: 57a71dd5f4cae8d61e0ac631a862589fb2bfd700
This commit is contained in:
djm@openbsd.org 2019-09-13 04:31:19 +00:00 committed by Damien Miller
parent fbe24b1429
commit 2aefdf1aef
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sshconnect.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshconnect.c,v 1.318 2019/09/13 04:27:35 djm Exp $ */ /* $OpenBSD: sshconnect.c,v 1.319 2019/09/13 04:31:19 djm Exp $ */
/* /*
* Author: Tatu Ylonen <ylo@cs.hut.fi> * Author: Tatu Ylonen <ylo@cs.hut.fi>
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * 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,
if (ssh_packet_set_connection(ssh, sock, sock) == NULL) if (ssh_packet_set_connection(ssh, sock, sock) == NULL)
return -1; /* ssh_packet_set_connection logs error */ return -1; /* ssh_packet_set_connection logs error */
return 0; return 0;
} }
int int
@ -794,7 +794,7 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port,
ip_status = check_key_in_hostkeys(ip_hostkeys, host_key, ip_status = check_key_in_hostkeys(ip_hostkeys, host_key,
&ip_found); &ip_found);
if (host_status == HOST_CHANGED && if (host_status == HOST_CHANGED &&
(ip_status != HOST_CHANGED || (ip_status != HOST_CHANGED ||
(ip_found != NULL && (ip_found != NULL &&
!sshkey_equal(ip_found->key, host_found->key)))) !sshkey_equal(ip_found->key, host_found->key))))
host_ip_differ = 1; host_ip_differ = 1;