diff options
author | dtucker@openbsd.org <dtucker@openbsd.org> | 2015-04-10 05:16:50 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2015-04-13 14:37:19 +1000 |
commit | d8f391caef62378463a0e6b36f940170dadfe605 (patch) | |
tree | 3a080f48952021b333e34bfc4747d9d54aa52b1c /sshd.c | |
parent | 2c2cfe1a1c97eb9a08cc9817fd0678209680c636 (diff) |
upstream commit
Don't send hostkey advertisments
(hostkeys-00@openssh.com) to current versions of Tera Term as they can't
handle them. Newer versions should be OK. Patch from Bryan Drewery and
IWAMOTO Kouichi, ok djm@
Diffstat (limited to 'sshd.c')
-rw-r--r-- | sshd.c | 6 |
1 files changed, 5 insertions, 1 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sshd.c,v 1.445 2015/03/31 22:55:24 djm Exp $ */ | 1 | /* $OpenBSD: sshd.c,v 1.446 2015/04/10 05:16:50 dtucker 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 |
@@ -928,6 +928,10 @@ notify_hostkeys(struct ssh *ssh) | |||
928 | int i, nkeys, r; | 928 | int i, nkeys, r; |
929 | char *fp; | 929 | char *fp; |
930 | 930 | ||
931 | /* Some clients cannot cope with the hostkeys message, skip those. */ | ||
932 | if (datafellows & SSH_BUG_HOSTKEYS) | ||
933 | return; | ||
934 | |||
931 | if ((buf = sshbuf_new()) == NULL) | 935 | if ((buf = sshbuf_new()) == NULL) |
932 | fatal("%s: sshbuf_new", __func__); | 936 | fatal("%s: sshbuf_new", __func__); |
933 | for (i = nkeys = 0; i < options.num_host_key_files; i++) { | 937 | for (i = nkeys = 0; i < options.num_host_key_files; i++) { |