diff options
Diffstat (limited to 'session.c')
-rw-r--r-- | session.c | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -8,7 +8,7 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include "includes.h" | 10 | #include "includes.h" |
11 | RCSID("$OpenBSD: session.c,v 1.6 2000/04/27 15:23:02 markus Exp $"); | 11 | RCSID("$OpenBSD: session.c,v 1.8 2000/04/29 16:06:08 markus Exp $"); |
12 | 12 | ||
13 | #include "xmalloc.h" | 13 | #include "xmalloc.h" |
14 | #include "ssh.h" | 14 | #include "ssh.h" |
@@ -1354,6 +1354,8 @@ session_input_channel_req(int id, void *arg) | |||
1354 | */ | 1354 | */ |
1355 | if (c->type == SSH_CHANNEL_LARVAL) { | 1355 | if (c->type == SSH_CHANNEL_LARVAL) { |
1356 | if (strcmp(rtype, "shell") == 0) { | 1356 | if (strcmp(rtype, "shell") == 0) { |
1357 | packet_done(); | ||
1358 | s->extended = 1; | ||
1357 | if (s->ttyfd == -1) | 1359 | if (s->ttyfd == -1) |
1358 | do_exec_no_pty(s, NULL, s->pw); | 1360 | do_exec_no_pty(s, NULL, s->pw); |
1359 | else | 1361 | else |
@@ -1363,7 +1365,6 @@ session_input_channel_req(int id, void *arg) | |||
1363 | char *command = packet_get_string(&len); | 1365 | char *command = packet_get_string(&len); |
1364 | packet_done(); | 1366 | packet_done(); |
1365 | s->extended = 1; | 1367 | s->extended = 1; |
1366 | s->extended = 1; | ||
1367 | if (s->ttyfd == -1) | 1368 | if (s->ttyfd == -1) |
1368 | do_exec_no_pty(s, command, s->pw); | 1369 | do_exec_no_pty(s, command, s->pw); |
1369 | else | 1370 | else |
@@ -1550,6 +1551,6 @@ do_authenticated2(void) | |||
1550 | */ | 1551 | */ |
1551 | alarm(0); | 1552 | alarm(0); |
1552 | server_loop2(); | 1553 | server_loop2(); |
1553 | if (xauthfile) | 1554 | if (xauthfile) |
1554 | xauthfile_cleanup_proc(NULL); | 1555 | xauthfile_cleanup_proc(NULL); |
1555 | } | 1556 | } |