diff options
| author | Marcus Arendt <[email protected]> | 2014-08-28 10:33:53 +0200 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-08-28 10:33:53 +0200 |
| commit | 94b7ece322468e30a3dda9e6c8aba57d62bdaac5 (patch) | |
| tree | 63760326220f9852d95f0239d9d76dfc6636e4f3 /lib/ssh/src/ssh_connection.erl | |
| parent | f5b36fc72e1ac37d00f82b7651b7ca06a628097f (diff) | |
| parent | 76b79e88aaf4d59e8cb057fe9a075cc27f0c79c8 (diff) | |
| download | otp-94b7ece322468e30a3dda9e6c8aba57d62bdaac5.tar.gz otp-94b7ece322468e30a3dda9e6c8aba57d62bdaac5.tar.bz2 otp-94b7ece322468e30a3dda9e6c8aba57d62bdaac5.zip | |
Merge branch 'michaelkschmidt/ssh_bug_fix' into maint
* michaelkschmidt/ssh_bug_fix:
Test Other Clauses of start_shell
Fix SSH CLI when using custom "shell" option
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)}, |