summaryrefslogtreecommitdiff
path: root/clientloop.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2009-07-06 07:17:35 +1000
committerDarren Tucker <dtucker@zip.com.au>2009-07-06 07:17:35 +1000
commitde0c025e3cfe5bfd384e759daa8b95cc245efa33 (patch)
treeb48d09ea3fc2a8a947450a6f2018c5dba1b1a6b9 /clientloop.c
parent199b1340a85de9f241935bc0fe56b71258839220 (diff)
- 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@
Diffstat (limited to 'clientloop.c')
-rw-r--r--clientloop.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/clientloop.c b/clientloop.c
index 43f001bc4..b8352f6bf 100644
--- a/clientloop.c
+++ b/clientloop.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: clientloop.c,v 1.212 2009/05/28 16:50:16 andreas Exp $ */ 1/* $OpenBSD: clientloop.c,v 1.213 2009/07/05 19:28:33 stevesk 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
@@ -1477,11 +1477,13 @@ client_loop(int have_pty, int escape_char_arg, int ssh2_chan_id)
1477 /* Stop watching for window change. */ 1477 /* Stop watching for window change. */
1478 signal(SIGWINCH, SIG_DFL); 1478 signal(SIGWINCH, SIG_DFL);
1479 1479
1480 packet_start(SSH2_MSG_DISCONNECT); 1480 if (compat20) {
1481 packet_put_int(SSH2_DISCONNECT_BY_APPLICATION); 1481 packet_start(SSH2_MSG_DISCONNECT);
1482 packet_put_cstring("disconnected by user"); 1482 packet_put_int(SSH2_DISCONNECT_BY_APPLICATION);
1483 packet_send(); 1483 packet_put_cstring("disconnected by user");
1484 packet_write_wait(); 1484 packet_send();
1485 packet_write_wait();
1486 }
1485 1487
1486 channel_free_all(); 1488 channel_free_all();
1487 1489