diff options
| author | Hans Nilsson <[email protected]> | 2014-10-13 11:17:52 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2014-10-13 11:17:52 +0200 |
| commit | 54a6b141cba05d89c5c376e40a403f217db6c46b (patch) | |
| tree | 1716190e62b2613eaee7830bdf4ea7892bc88637 /lib/ssh/src | |
| parent | 19d5fff19746454cbe343d347938d33016aaa764 (diff) | |
| parent | d086394ebd3595d431835af80709977a6c1c7c89 (diff) | |
| download | otp-54a6b141cba05d89c5c376e40a403f217db6c46b.tar.gz otp-54a6b141cba05d89c5c376e40a403f217db6c46b.tar.bz2 otp-54a6b141cba05d89c5c376e40a403f217db6c46b.zip | |
Merge branch 'hans/ssh/closed_int/OTP-12004' into maint
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh_connection.erl | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl index 33849f4527..87f37b93ef 100644 --- a/lib/ssh/src/ssh_connection.erl +++ b/lib/ssh/src/ssh_connection.erl @@ -107,9 +107,15 @@ shell(ConnectionHandler, ChannelId) -> %% Description: Executes a predefined subsystem. %%-------------------------------------------------------------------- subsystem(ConnectionHandler, ChannelId, SubSystem, TimeOut) -> - ssh_connection_handler:request(ConnectionHandler, self(), - ChannelId, "subsystem", - true, [?string(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. + %%-------------------------------------------------------------------- -spec send(pid(), channel_id(), iodata()) -> ok | {error, closed}. |