diff options
| author | Michael K. Schmidt <[email protected]> | 2014-07-22 15:59:15 -0500 |
|---|---|---|
| committer | Michael K. Schmidt <[email protected]> | 2014-07-23 15:09:45 -0500 |
| commit | 375e6da4a0daa6592a418ecb53afa37aa186f38f (patch) | |
| tree | 380ca9af8766dae067c2412981666d5eed9aad93 /lib/ssh/src/ssh_connection.erl | |
| parent | 172e812c491680fbb175f56f7604d4098cdc9de4 (diff) | |
| download | otp-375e6da4a0daa6592a418ecb53afa37aa186f38f.tar.gz otp-375e6da4a0daa6592a418ecb53afa37aa186f38f.tar.bz2 otp-375e6da4a0daa6592a418ecb53afa37aa186f38f.zip | |
Fix SSH CLI when using custom "shell" option
Also address compatibility issue with PuTTY
Diffstat (limited to 'lib/ssh/src/ssh_connection.erl')
| -rw-r--r-- | lib/ssh/src/ssh_connection.erl | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl index b377614949..33849f4527 100644 --- a/lib/ssh/src/ssh_connection.erl +++ b/lib/ssh/src/ssh_connection.erl @@ -782,9 +782,8 @@ handle_cli_msg(#connection{channel_cache = Cache} = Connection, erlang:monitor(process, Pid), Channel = Channel0#channel{user = Pid}, ssh_channel:cache_update(Cache, Channel), - Reply = {connection_reply, - channel_success_msg(RemoteId)}, - {{replies, [{channel_data, Pid, Reply0}, Reply]}, Connection}; + {Reply, Connection1} = reply_msg(Channel, Connection, Reply0), + {{replies, [Reply]}, Connection1}; _Other -> Reply = {connection_reply, channel_failure_msg(RemoteId)}, |