projects
/
u
/
mdw
/
putty
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Close on exit. I'm not entirely happy with the distribution of this
[u/mdw/putty]
/
ssh.c
diff --git
a/ssh.c
b/ssh.c
index
58e72f5
..
b9d906d
100644
(file)
--- a/
ssh.c
+++ b/
ssh.c
@@
-2383,7
+2383,8
@@
static void ssh_process_queued_incoming_data(Ssh ssh)
static void ssh_set_frozen(Ssh ssh, int frozen)
{
static void ssh_set_frozen(Ssh ssh, int frozen)
{
- sk_set_frozen(ssh->s, frozen);
+ if (ssh->s)
+ sk_set_frozen(ssh->s, frozen);
ssh->frozen = frozen;
}
ssh->frozen = frozen;
}
@@
-2932,6
+2933,7
@@
static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
if (s->dlgret == 0) {
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
if (s->dlgret == 0) {
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
+ crStop(0);
}
}
}
}
@@
-3012,6
+3014,7
@@
static int do_ssh1_login(Ssh ssh, unsigned char *in, int inlen,
if (s->dlgret == 0) {
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
if (s->dlgret == 0) {
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
+ crStop(0);
}
}
}
}
}
}
@@
-4618,6
+4621,8
@@
static void do_ssh1_connection(Ssh ssh, unsigned char *in, int inlen,
*/
{
char *cmd = ssh->cfg.remote_cmd_ptr;
*/
{
char *cmd = ssh->cfg.remote_cmd_ptr;
+
+ if (!cmd) cmd = ssh->cfg.remote_cmd;
if (ssh->cfg.ssh_subsys && ssh->cfg.remote_cmd_ptr2) {
cmd = ssh->cfg.remote_cmd_ptr2;
if (ssh->cfg.ssh_subsys && ssh->cfg.remote_cmd_ptr2) {
cmd = ssh->cfg.remote_cmd_ptr2;
@@
-5217,6
+5222,7
@@
static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
if (s->dlgret == 0) {
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
if (s->dlgret == 0) {
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
+ crStop(0);
}
}
}
}
@@
-5241,6
+5247,7
@@
static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
if (s->dlgret == 0) {
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
if (s->dlgret == 0) {
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
+ crStop(0);
}
}
}
}
@@
-5265,6
+5272,7
@@
static int do_ssh2_transport(Ssh ssh, void *vin, int inlen,
if (s->dlgret == 0) {
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
if (s->dlgret == 0) {
ssh->close_expected = TRUE;
ssh_closing((Plug)ssh, NULL, 0, 0);
+ crStop(0);
}
}
}
}
@@
-7323,6
+7331,7
@@
static void do_ssh2_authconn(Ssh ssh, unsigned char *in, int inlen,
} else {
subsys = ssh->cfg.ssh_subsys;
cmd = ssh->cfg.remote_cmd_ptr;
} else {
subsys = ssh->cfg.ssh_subsys;
cmd = ssh->cfg.remote_cmd_ptr;
+ if (!cmd) cmd = ssh->cfg.remote_cmd;
}
s->pktout = ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST);
}
s->pktout = ssh2_pkt_init(SSH2_MSG_CHANNEL_REQUEST);