diff options
Diffstat (limited to 'ssh.c')
-rw-r--r-- | ssh.c | 19 |
1 files changed, 2 insertions, 17 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh.c,v 1.310 2008/05/08 12:02:23 djm Exp $ */ | 1 | /* $OpenBSD: ssh.c,v 1.311 2008/05/08 13:06:11 djm 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 |
@@ -1039,21 +1039,6 @@ ssh_session(void) | |||
1039 | options.escape_char : SSH_ESCAPECHAR_NONE, 0); | 1039 | options.escape_char : SSH_ESCAPECHAR_NONE, 0); |
1040 | } | 1040 | } |
1041 | 1041 | ||
1042 | static void | ||
1043 | ssh_subsystem_reply(int type, u_int32_t seq, void *ctxt) | ||
1044 | { | ||
1045 | int id, len; | ||
1046 | |||
1047 | id = packet_get_int(); | ||
1048 | len = buffer_len(&command); | ||
1049 | if (len > 900) | ||
1050 | len = 900; | ||
1051 | packet_check_eom(); | ||
1052 | if (type == SSH2_MSG_CHANNEL_FAILURE) | ||
1053 | fatal("Request for subsystem '%.*s' failed on channel %d", | ||
1054 | len, (u_char *)buffer_ptr(&command), id); | ||
1055 | } | ||
1056 | |||
1057 | void | 1042 | void |
1058 | client_global_request_reply_fwd(int type, u_int32_t seq, void *ctxt) | 1043 | client_global_request_reply_fwd(int type, u_int32_t seq, void *ctxt) |
1059 | { | 1044 | { |
@@ -1150,7 +1135,7 @@ ssh_session2_setup(int id, void *arg) | |||
1150 | } | 1135 | } |
1151 | 1136 | ||
1152 | client_session2_setup(id, tty_flag, subsystem_flag, getenv("TERM"), | 1137 | client_session2_setup(id, tty_flag, subsystem_flag, getenv("TERM"), |
1153 | NULL, fileno(stdin), &command, environ, &ssh_subsystem_reply); | 1138 | NULL, fileno(stdin), &command, environ); |
1154 | 1139 | ||
1155 | packet_set_interactive(interactive); | 1140 | packet_set_interactive(interactive); |
1156 | } | 1141 | } |