Merge branch 'maint'

2 files changed, 36 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}.
diff --git a/lib/ssh/test/ssh_connection_SUITE.erl b/lib/ssh/test/ssh_connection_SUITE.erl
index d226e5ba03..3c537d719c 100644
--- a/lib/ssh/test/ssh_connection_SUITE.erl
+++ b/lib/ssh/test/ssh_connection_SUITE.erl
@@ -37,6 +37,7 @@
 all() ->
     [
      {group, openssh_payload},
+     start_subsystem_on_closed_channel,
      interrupted_send,
      start_shell,
      start_shell_exec,
@@ -241,6 +242,32 @@ send_after_exit(Config) when is_list(Config) ->
     end.
 
 %%--------------------------------------------------------------------
+start_subsystem_on_closed_channel(Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    UserDir = filename:join(PrivDir, nopubkey), % to make sure we don't use public-key-auth
+    file:make_dir(UserDir),
+    SysDir = ?config(data_dir, Config),
+    {Pid, Host, Port} = ssh_test_lib:daemon([{system_dir, SysDir},
+					     {user_dir, UserDir},
+					     {password, "morot"},
+					     {subsystems, [{"echo_n", {ssh_echo_server, [4000000]}}]}]),
+
+    ConnectionRef = ssh_test_lib:connect(Host, Port, [{silently_accept_hosts, true},
+						      {user, "foo"},
+						      {password, "morot"},
+						      {user_interaction, false},
+						      {user_dir, UserDir}]),
+
+    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
+
+    ok = ssh_connection:close(ConnectionRef, ChannelId),
+
+    failure = ssh_connection:subsystem(ConnectionRef, ChannelId, "echo_n", infinity),
+
+    ssh:close(ConnectionRef),
+    ssh:stop_daemon(Pid).
+
+%%--------------------------------------------------------------------
 interrupted_send() ->
     [{doc, "Use a subsystem that echos n char and then sends eof to cause a channel exit partway through a large send."}].