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."
margnus1 · Dec 5, 2014 · e2242fb · e2242fb
2 parents e0414e9 + 916742c
commit e2242fb
Showing 1 changed file with 3 additions and 9 deletions.
diff --git 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}.