diff options
author | Damien Miller <djm@mindrot.org> | 2010-03-22 05:54:02 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2010-03-22 05:54:02 +1100 |
commit | 8ddc71c13d3aac3f7eb13b67dc703b5508eae732 (patch) | |
tree | 372171e5a1dbf13bd4f1daa846ce64b2d59a94a1 | |
parent | 4a5f0d325b723dcfdcc540f83ae8a3c08a589d7e (diff) |
- djm@cvs.openbsd.org 2010/03/13 21:10:38
[clientloop.c]
protocol conformance fix: send language tag when disconnecting normally;
spotted by 1.41421 AT gmail.com, ok markus@ deraadt@
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | clientloop.c | 3 |
2 files changed, 6 insertions, 1 deletions
@@ -19,6 +19,10 @@ | |||
19 | [servconf.c] | 19 | [servconf.c] |
20 | do not prepend AuthorizedKeysFile with getcwd(), unbreaks relative paths | 20 | do not prepend AuthorizedKeysFile with getcwd(), unbreaks relative paths |
21 | free() (not xfree()) the buffer returned by getcwd() | 21 | free() (not xfree()) the buffer returned by getcwd() |
22 | - djm@cvs.openbsd.org 2010/03/13 21:10:38 | ||
23 | [clientloop.c] | ||
24 | protocol conformance fix: send language tag when disconnecting normally; | ||
25 | spotted by 1.41421 AT gmail.com, ok markus@ deraadt@ | ||
22 | 26 | ||
23 | 20100314 | 27 | 20100314 |
24 | - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix | 28 | - (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix |
diff --git a/clientloop.c b/clientloop.c index 6ffef95a2..9ab56b44c 100644 --- a/clientloop.c +++ b/clientloop.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: clientloop.c,v 1.218 2010/01/28 00:21:18 djm Exp $ */ | 1 | /* $OpenBSD: clientloop.c,v 1.219 2010/03/13 21:10:38 djm 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 |
@@ -1484,6 +1484,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
1484 | packet_start(SSH2_MSG_DISCONNECT); | 1484 | packet_start(SSH2_MSG_DISCONNECT); |
1485 | packet_put_int(SSH2_DISCONNECT_BY_APPLICATION); | 1485 | packet_put_int(SSH2_DISCONNECT_BY_APPLICATION); |
1486 | packet_put_cstring("disconnected by user"); | 1486 | packet_put_cstring("disconnected by user"); |
1487 | packet_put_cstring(""); /* language tag */ | ||
1487 | packet_send(); | 1488 | packet_send(); |
1488 | packet_write_wait(); | 1489 | packet_write_wait(); |
1489 | } | 1490 | } |