diff options
| author | Darren Tucker <dtucker@zip.com.au> | 2009-07-06 07:17:35 +1000 |
|---|---|---|
| committer | Darren Tucker <dtucker@zip.com.au> | 2009-07-06 07:17:35 +1000 |
| commit | de0c025e3cfe5bfd384e759daa8b95cc245efa33 (patch) | |
| tree | b48d09ea3fc2a8a947450a6f2018c5dba1b1a6b9 | |
| parent | 199b1340a85de9f241935bc0fe56b71258839220 (diff) | |
| download | openssh-git-de0c025e3cfe5bfd384e759daa8b95cc245efa33.tar.gz | |
- stevesk@cvs.openbsd.org 2009/07/05 19:28:33
[clientloop.c]
only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@
ok deraadt@ markus@
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | clientloop.c | 14 |
2 files changed, 12 insertions, 6 deletions
@@ -23,6 +23,10 @@ [ssh.c] allow for long home dir paths (bz #1615). ok deraadt (based in part on a patch from jchadima at redhat) + - stevesk@cvs.openbsd.org 2009/07/05 19:28:33 + [clientloop.c] + only send SSH2_MSG_DISCONNECT if we're in compat20; from dtucker@ + ok deraadt@ markus@ 20090622 - (dtucker) OpenBSD CVS Sync diff --git a/clientloop.c b/clientloop.c index 43f001bc..b8352f6b 100644 --- a/clientloop.c +++ b/clientloop.c @@ -1,4 +1,4 @@ -/* $OpenBSD: clientloop.c,v 1.212 2009/05/28 16:50:16 andreas Exp $ */ +/* $OpenBSD: clientloop.c,v 1.213 2009/07/05 19:28:33 stevesk Exp $ */ /* * Author: Tatu Ylonen <ylo@cs.hut.fi> * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland @@ -1477,11 +1477,13 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id) /* Stop watching for window change. */ signal(SIGWINCH, SIG_DFL); - packet_start(SSH2_MSG_DISCONNECT); - packet_put_int(SSH2_DISCONNECT_BY_APPLICATION); - packet_put_cstring("disconnected by user"); - packet_send(); - packet_write_wait(); + if (compat20) { + packet_start(SSH2_MSG_DISCONNECT); + packet_put_int(SSH2_DISCONNECT_BY_APPLICATION); + packet_put_cstring("disconnected by user"); + packet_send(); + packet_write_wait(); + } channel_free_all(); |