diff options
| author | Marcus Arendt <[email protected]> | 2014-12-05 14:50:10 +0100 |
|---|---|---|
| committer | Marcus Arendt <[email protected]> | 2014-12-05 14:50:10 +0100 |
| commit | e2242fb7fa98feec9242c71a473af7e99d6a7bd1 (patch) | |
| tree | b1b3f3c5a4563a1c6adf4f91e1628208dbf8d3d7 | |
| parent | e0414e9f0f5924e3f794dd824715f96313198987 (diff) | |
| parent | 916742c90667dde5ebb62d9e796de517232ad5fe (diff) | |
| download | otp-e2242fb7fa98feec9242c71a473af7e99d6a7bd1.tar.gz otp-e2242fb7fa98feec9242c71a473af7e99d6a7bd1.tar.bz2 otp-e2242fb7fa98feec9242c71a473af7e99d6a7bd1.zip | |
Merge branch 'marcus/revert-ssh-fix/OTP-12004' into maint
* marcus/revert-ssh-fix/OTP-12004:
Revert "ssh: Corrected ret val from ssh_connection:subsystem/4."
| -rw-r--r-- | lib/ssh/src/ssh_connection.erl | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl index 593443e11c..01141622d6 100644 --- a/lib/ssh/src/ssh_connection.erl +++ b/lib/ssh/src/ssh_connection.erl @@ -107,15 +107,9 @@ shell(ConnectionHandler, ChannelId) -> %% Description: Executes a predefined subsystem. %%-------------------------------------------------------------------- subsystem(ConnectionHandler, ChannelId, SubSystem, TimeOut) -> - case ssh_connection_handler:request(ConnectionHandler, self(), - ChannelId, "subsystem", - true, [?string(SubSystem)], TimeOut) of - success -> success; - failure -> failure; - {error,timeout} -> {error,timeout}; - _ -> failure - end. - + ssh_connection_handler:request(ConnectionHandler, self(), + ChannelId, "subsystem", + true, [?string(SubSystem)], TimeOut). %%-------------------------------------------------------------------- -spec send(pid(), channel_id(), iodata()) -> ok | {error, closed}. |