diff options
| author | Nobutomo Nakano <Nobutomo.Nakano@Sun.COM> | 2009-05-11 12:11:53 -0700 |
|---|---|---|
| committer | Nobutomo Nakano <Nobutomo.Nakano@Sun.COM> | 2009-05-11 12:11:53 -0700 |
| commit | 6f786ace10b9c0c7c5515e525fb660fbccfda6a3 (patch) | |
| tree | a455902edb891743770d97ebb458821963392a26 /usr/src/cmd/ssh/libssh/common/compat.c | |
| parent | 1c7408c96b4914bcab86c14af29f1af003397b16 (diff) | |
| download | illumos-gate-6f786ace10b9c0c7c5515e525fb660fbccfda6a3.tar.gz | |
6740240 ssh: password prompt is garbled on ja_JP.PCK/ja_JP.eucJP locale
Diffstat (limited to 'usr/src/cmd/ssh/libssh/common/compat.c')
| -rw-r--r-- | usr/src/cmd/ssh/libssh/common/compat.c | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/usr/src/cmd/ssh/libssh/common/compat.c b/usr/src/cmd/ssh/libssh/common/compat.c index 3f4652fca5..e91c553a8f 100644 --- a/usr/src/cmd/ssh/libssh/common/compat.c +++ b/usr/src/cmd/ssh/libssh/common/compat.c @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ /* - * Copyright 2008 Sun Microsystems, Inc. All rights reserved. + * Copyright 2009 Sun Microsystems, Inc. All rights reserved. * Use is subject to license terms. */ @@ -38,7 +38,7 @@ RCSID("$OpenBSD: compat.c,v 1.65 2002/09/27 10:42:09 mickey Exp $"); int compat13 = 0; int compat20 = 0; -int datafellows = 0; +uint32_t datafellows = 0; void enable_compat20(void) @@ -59,7 +59,7 @@ compat_datafellows(const char *version) int i; static struct { char *pat; - int bugs; + uint32_t bugs; } check[] = { { "OpenSSH-2.0*," "OpenSSH-2.1*," @@ -105,9 +105,12 @@ compat_datafellows(const char *version) SSH_BUG_LOCALES_NOT_LANGTAGS|SSH_OLD_FORWARD_ADDR}, { "Sun_SSH_1.0*", SSH_BUG_NOREKEY|SSH_BUG_EXTEOF| SSH_BUG_LOCALES_NOT_LANGTAGS|SSH_OLD_FORWARD_ADDR}, - { "Sun_SSH_1.1*", SSH_OLD_FORWARD_ADDR}, - { "Sun_SSH_1.2*", 0 }, - { "Sun_SSH_1.3*", 0 }, + { "Sun_SSH_1.1.1*", SSH_OLD_FORWARD_ADDR|SSH_BUG_STRING_ENCODING}, + { "Sun_SSH_1.1.2*", SSH_OLD_FORWARD_ADDR}, + { "Sun_SSH_1.1*", SSH_OLD_FORWARD_ADDR|SSH_BUG_STRING_ENCODING}, + { "Sun_SSH_1.2*", SSH_BUG_STRING_ENCODING}, + { "Sun_SSH_1.3*", SSH_BUG_STRING_ENCODING}, + { "Sun_SSH_1.4*", 0 }, { "Sun_SSH_*", 0 }, { "*MindTerm*", 0 }, { "2.1.0*", SSH_BUG_SIGBLOB|SSH_BUG_HMAC| |