summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--compat.c4
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 5b53c216c..cf4be5449 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -108,6 +108,9 @@
108 versions. 108 versions.
109 109
110 reported by Aris Adamantiadis; ok markus@ 110 reported by Aris Adamantiadis; ok markus@
111 - djm@cvs.openbsd.org 2014/04/19 05:54:59
112 [compat.c]
113 missing wildcard; pointed out by naddy@
111 114
11220140401 11520140401
113 - (djm) On platforms that support it, use prctl() to prevent sftp-server 116 - (djm) On platforms that support it, use prctl() to prevent sftp-server
diff --git a/compat.c b/compat.c
index 64f9790a8..12a7d5de7 100644
--- a/compat.c
+++ b/compat.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: compat.c,v 1.83 2014/04/18 23:52:25 djm Exp $ */ 1/* $OpenBSD: compat.c,v 1.84 2014/04/19 05:54:59 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 *
@@ -96,7 +96,7 @@ compat_datafellows(const char *version)
96 { "OpenSSH_4*", 0 }, 96 { "OpenSSH_4*", 0 },
97 { "OpenSSH_5*", SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT}, 97 { "OpenSSH_5*", SSH_NEW_OPENSSH|SSH_BUG_DYNAMIC_RPORT},
98 { "OpenSSH_6.5*," 98 { "OpenSSH_6.5*,"
99 "OpenSSH_6.6", SSH_NEW_OPENSSH|SSH_BUG_CURVE25519PAD}, 99 "OpenSSH_6.6*", SSH_NEW_OPENSSH|SSH_BUG_CURVE25519PAD},
100 { "OpenSSH*", SSH_NEW_OPENSSH }, 100 { "OpenSSH*", SSH_NEW_OPENSSH },
101 { "*MindTerm*", 0 }, 101 { "*MindTerm*", 0 },
102 { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| 102 { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC|