summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordjm <djm>2010-03-21 18:54:02 +0000
committerdjm <djm>2010-03-21 18:54:02 +0000
commit32e2dd4b537a542e860a0a50ef62834141defc86 (patch)
tree9d7cb27289ea0d1951edd3af0923635a05c26078
parent656cd813da85a36ee1001849842121b7d6c0aa6b (diff)
downloadopenssh-32e2dd4b537a542e860a0a50ef62834141defc86.tar.gz
- 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--ChangeLog4
-rw-r--r--clientloop.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 95c87ba2..3dc71805 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,10 @@
[servconf.c]
do not prepend AuthorizedKeysFile with getcwd(), unbreaks relative paths
free() (not xfree()) the buffer returned by getcwd()
+ - 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@
20100314
- (djm) [ssh-pkcs11-helper.c] Move #ifdef to after #defines to fix
diff --git a/clientloop.c b/clientloop.c
index 6ffef95a..9ab56b44 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: clientloop.c,v 1.218 2010/01/28 00:21:18 djm Exp $ */
+/* $OpenBSD: clientloop.c,v 1.219 2010/03/13 21:10:38 djm Exp $ */
/*
* Author: Tatu Ylonen <ylo@cs.hut.fi>
* 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)
packet_start(SSH2_MSG_DISCONNECT);
packet_put_int(SSH2_DISCONNECT_BY_APPLICATION);
packet_put_cstring("disconnected by user");
+ packet_put_cstring(""); /* language tag */
packet_send();
packet_write_wait();
}