diff options
author | Hans Nilsson <[email protected]> | 2014-10-13 11:19:11 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2014-10-13 11:19:11 +0200 |
commit | 527922fc932fff13a6a2bed7f13de4148e26885f (patch) | |
tree | 8f2df42b95a6a4920f3d246c2c428b42a04c35ba /lib/ssh/src | |
parent | 7e81a34b1b9872754c2f9b5a6c6a5c0b2aa449d3 (diff) | |
parent | 54a6b141cba05d89c5c376e40a403f217db6c46b (diff) | |
download | otp-527922fc932fff13a6a2bed7f13de4148e26885f.tar.gz otp-527922fc932fff13a6a2bed7f13de4148e26885f.tar.bz2 otp-527922fc932fff13a6a2bed7f13de4148e26885f.zip |
Merge branch '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}. |