diff options
| author |   djm <djm@openbsd.org> | 2021-01-27 09:26:53 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2021-01-27 09:26:53 +0000 |
| commit | e9d148002645cf940f00f302cb4b8cd9c8931a72 (patch) | |
| tree | f069aab07aa0d8db3d5a2dd8fb7a295484b3b0b9 /usr.bin/ssh/ssh-keyscan.c | |
| parent | Be consistent in not using parameter names for function prototypes. (diff) | |
| download | wireguard-openbsd-e9d148002645cf940f00f302cb4b8cd9c8931a72.tar.xz wireguard-openbsd-e9d148002645cf940f00f302cb4b8cd9c8931a72.zip | |
remove global variable used to stash compat flags and use the
purpose-built ssh->compat variable instead; feedback/ok markus@
Diffstat (limited to 'usr.bin/ssh/ssh-keyscan.c')
| -rw-r--r-- | usr.bin/ssh/ssh-keyscan.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/usr.bin/ssh/ssh-keyscan.c b/usr.bin/ssh/ssh-keyscan.c index 4bd0bb2c001..bae2d58f4e9 100644 --- a/usr.bin/ssh/ssh-keyscan.c +++ b/usr.bin/ssh/ssh-keyscan.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-keyscan.c,v 1.138 2020/12/29 00:59:15 djm Exp $ */ +/* $OpenBSD: ssh-keyscan.c,v 1.139 2021/01/27 09:26:54 djm Exp $ */ /* * Copyright 1995, 1996 by David Mazieres <dm@lcs.mit.edu>. * @@ -504,11 +504,10 @@ congreet(int s) fatal("ssh_packet_set_connection failed"); ssh_packet_set_timeout(c->c_ssh, timeout, 1); ssh_set_app_data(c->c_ssh, c); /* back link */ + c->c_ssh->compat = 0; if (sscanf(buf, "SSH-%d.%d-%[^\n]\n", &remote_major, &remote_minor, remote_version) == 3) - c->c_ssh->compat = compat_datafellows(remote_version); - else - c->c_ssh->compat = 0; + compat_banner(c->c_ssh, remote_version); if (!ssh2_capable(remote_major, remote_minor)) { debug("%s doesn't support ssh2", c->c_name); confree(s); |