diff options
| author |   djm <djm@openbsd.org> | 2019-09-13 04:31:19 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2019-09-13 04:31:19 +0000 |
| commit | 330b3c8235d563ab2b653d2227049b3a5778d70d (patch) | |
| tree | 601017e5930b0a8a1fa64ecfe1c84cea7cd54787 /usr.bin/ssh/sshconnect.c | |
| parent | allow %n to be expanded in ProxyCommand strings (diff) | |
| download | wireguard-openbsd-330b3c8235d563ab2b653d2227049b3a5778d70d.tar.xz wireguard-openbsd-330b3c8235d563ab2b653d2227049b3a5778d70d.zip | |
whitespace
Diffstat (limited to 'usr.bin/ssh/sshconnect.c')
| -rw-r--r-- | usr.bin/ssh/sshconnect.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.bin/ssh/sshconnect.c b/usr.bin/ssh/sshconnect.c index 768425ecae9..7749ab44dc4 100644 --- a/usr.bin/ssh/sshconnect.c +++ b/usr.bin/ssh/sshconnect.c @@ -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> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -519,7 +519,7 @@ ssh_connect_direct(struct ssh *ssh, const char *host, struct addrinfo *aitop, if (ssh_packet_set_connection(ssh, sock, sock) == NULL) return -1; /* ssh_packet_set_connection logs error */ - return 0; + return 0; } int @@ -754,7 +754,7 @@ check_host_key(char *hostname, struct sockaddr *hostaddr, u_short port, ip_status = check_key_in_hostkeys(ip_hostkeys, host_key, &ip_found); if (host_status == HOST_CHANGED && - (ip_status != HOST_CHANGED || + (ip_status != HOST_CHANGED || (ip_found != NULL && !sshkey_equal(ip_found->key, host_found->key)))) host_ip_differ = 1; |