summaryrefslogtreecommitdiff
path: root/compat.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2018-04-16 22:50:44 +0000
committerDamien Miller <djm@mindrot.org>2018-04-17 08:51:51 +1000
commita575ddd58835759393d2dddd16ebe5abdb56485e (patch)
treec40974847366d2498f56286d8ec763d9f1c3f0a6 /compat.c
parent390c7000a8946db565b66eab9e52fb11948711fa (diff)
upstream: Disable SSH2_MSG_DEBUG messages for Twisted Conch clients
without version numbers since they choke on them under some circumstances. https://twistedmatrix.com/trac/ticket/9422 via Colin Watson Newer Conch versions have a version number in their ident string and handle debug messages okay. https://twistedmatrix.com/trac/ticket/9424 OpenBSD-Commit-ID: 6cf7be262af0419c58ddae11324d9c0dc1577539
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/compat.c b/compat.c
index 861e9e21f..1c0e08732 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: compat.c,v 1.106 2018/02/16 04:43:11 dtucker Exp $ */ 1/* $OpenBSD: compat.c,v 1.107 2018/04/16 22:50:44 djm Exp $ */
2/* 2/*
3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved. 3 * Copyright (c) 1999, 2000, 2001, 2002 Markus Friedl. All rights reserved.
4 * 4 *
@@ -128,6 +128,8 @@ compat_datafellows(const char *version)
128 SSH_OLD_DHGEX }, 128 SSH_OLD_DHGEX },
129 { "ConfD-*", 129 { "ConfD-*",
130 SSH_BUG_UTF8TTYMODE }, 130 SSH_BUG_UTF8TTYMODE },
131 { "Twisted_*", 0 },
132 { "Twisted*", SSH_BUG_DEBUG },
131 { NULL, 0 } 133 { NULL, 0 }
132 }; 134 };
133 135