diff options
author | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:25:59 +0100 |
---|---|---|
committer | Colin Watson <cjwatson@debian.org> | 2010-04-16 10:25:59 +0100 |
commit | 716621abf50722a46f97ecafed5ce134c94f1a81 (patch) | |
tree | 9993f08b7ea89f3038c3cfcf8fd1c71bdc7e7ae7 /clientloop.c | |
parent | ae31b42e02d7bf7004ec0302088f4e169c0f08ce (diff) | |
parent | 78eedc2c60ff4718200f9271d8ee4f437da3a0c5 (diff) |
* New upstream release:
- Unbreak sshd_config's AuthorizedKeysFile option for $HOME-relative
paths.
- Include a language tag when sending a protocol 2 disconnection
message.
- Make logging of certificates used for user authentication more clear
and consistent between CAs specified using TrustedUserCAKeys and
authorized_keys.
Diffstat (limited to 'clientloop.c')
-rw-r--r-- | clientloop.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clientloop.c b/clientloop.c index 56f8dd2f8..05e7de067 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 |
@@ -1502,6 +1502,7 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) | |||
1502 | packet_start(SSH2_MSG_DISCONNECT); | 1502 | packet_start(SSH2_MSG_DISCONNECT); |
1503 | packet_put_int(SSH2_DISCONNECT_BY_APPLICATION); | 1503 | packet_put_int(SSH2_DISCONNECT_BY_APPLICATION); |
1504 | packet_put_cstring("disconnected by user"); | 1504 | packet_put_cstring("disconnected by user"); |
1505 | packet_put_cstring(""); /* language tag */ | ||
1505 | packet_send(); | 1506 | packet_send(); |
1506 | packet_write_wait(); | 1507 | packet_write_wait(); |
1507 | } | 1508 | } |