- 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@
This commit is contained in:
parent
199b1340a8
commit
de0c025e3c
|
@ -23,6 +23,10 @@
|
||||||
[ssh.c]
|
[ssh.c]
|
||||||
allow for long home dir paths (bz #1615). ok deraadt
|
allow for long home dir paths (bz #1615). ok deraadt
|
||||||
(based in part on a patch from jchadima at redhat)
|
(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
|
20090622
|
||||||
- (dtucker) OpenBSD CVS Sync
|
- (dtucker) OpenBSD CVS Sync
|
||||||
|
|
14
clientloop.c
14
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>
|
* Author: Tatu Ylonen <ylo@cs.hut.fi>
|
||||||
* Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland
|
* 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. */
|
/* Stop watching for window change. */
|
||||||
signal(SIGWINCH, SIG_DFL);
|
signal(SIGWINCH, SIG_DFL);
|
||||||
|
|
||||||
packet_start(SSH2_MSG_DISCONNECT);
|
if (compat20) {
|
||||||
packet_put_int(SSH2_DISCONNECT_BY_APPLICATION);
|
packet_start(SSH2_MSG_DISCONNECT);
|
||||||
packet_put_cstring("disconnected by user");
|
packet_put_int(SSH2_DISCONNECT_BY_APPLICATION);
|
||||||
packet_send();
|
packet_put_cstring("disconnected by user");
|
||||||
packet_write_wait();
|
packet_send();
|
||||||
|
packet_write_wait();
|
||||||
|
}
|
||||||
|
|
||||||
channel_free_all();
|
channel_free_all();
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue