Merge branch 'ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714' into maint-r16

* ia/ssh/errorhandling-nonexisting-subsystem/OTP-10714:
  ssh: Prepare for upcoming release
  ssh: Test and enhance handling of nonexistent subsystem
  Prepare release
  Fixed rekeying initiation and secured testcase

3 files changed, 46 insertions, 6 deletions

diff --git a/lib/ssh/test/ssh_basic_SUITE.erl b/lib/ssh/test/ssh_basic_SUITE.erl
index efcb11f88f..80273420d9 100644
--- a/lib/ssh/test/ssh_basic_SUITE.erl
+++ b/lib/ssh/test/ssh_basic_SUITE.erl
@@ -272,7 +272,7 @@ rekey(Config) ->
 					  {user_interaction, false},
 					  {rekey_limit, 0}]),
     receive
-    after 15000 ->
+    after 200000 ->
 	    %%By this time rekeying would have been done
 	    ssh:close(ConnectionRef),
 	    ssh:stop_daemon(Pid)
diff --git a/lib/ssh/test/ssh_sftp_SUITE.erl b/lib/ssh/test/ssh_sftp_SUITE.erl
index 232161d029..ac93db8f2e 100644
--- a/lib/ssh/test/ssh_sftp_SUITE.erl
+++ b/lib/ssh/test/ssh_sftp_SUITE.erl
@@ -41,7 +41,9 @@ suite() ->
 
 all() -> 
     [{group, erlang_server},
-     {group, openssh_server}].
+     {group, openssh_server},
+     sftp_nonexistent_subsystem
+    ].
 
 
 init_per_suite(Config) ->
@@ -76,9 +78,7 @@ init_per_group(erlang_server, Config) ->
 	ssh_test_lib:daemon([{system_dir, SysDir},
 			     {user_dir, PrivDir},
 			     {user_passwords,
-			      [{?USER, ?PASSWD}]},
-			     {failfun,
-			      fun ssh_test_lib:failfun/2}]),
+			      [{?USER, ?PASSWD}]}]),
     [{group, erlang_server}, {sftpd, Sftpd} | Config];
 
 init_per_group(openssh_server, Config) ->
@@ -100,6 +100,17 @@ end_per_group(_, Config) ->
 
 %%--------------------------------------------------------------------
 
+init_per_testcase(sftp_nonexistent_subsystem, Config) ->
+    PrivDir = ?config(priv_dir, Config),
+    SysDir =  ?config(data_dir, Config),
+    Sftpd = ssh_test_lib:daemon([{system_dir, SysDir},
+				 {user_dir, PrivDir},
+				 {subsystems, []},
+				 {user_passwords,
+				  [{?USER, ?PASSWD}]}
+				]),
+    [{sftpd, Sftpd} | Config];
+
 init_per_testcase(Case, Config) ->
     prep(Config),
     TmpConfig0 = lists:keydelete(watchdog, 1, Config),
@@ -129,6 +140,8 @@ init_per_testcase(Case, Config) ->
 	    [{sftp, Sftp}, {watchdog, Dog} | TmpConfig]
     end.
 
+end_per_testcase(sftp_nonexistent_subsystem, Config) ->
+    Config;
 end_per_testcase(rename_file, Config) ->
     PrivDir = ?config(priv_dir, Config),
     NewFileName = filename:join(PrivDir, "test.txt"),
@@ -423,6 +436,17 @@ pos_write(Config) when is_list(Config) ->
     {ok, NewData1} = ssh_sftp:read_file(Sftp, FileName).
 
 %%--------------------------------------------------------------------
+sftp_nonexistent_subsystem() ->
+    [""].
+sftp_nonexistent_subsystem(Config) when is_list(Config) ->
+    {_,Host, Port} =  ?config(sftpd, Config),
+    {error,"server failed to start sftp subsystem"} =
+	ssh_sftp:start_channel(Host, Port,
+			       [{user_interaction, false},
+				{user, ?USER}, {password, ?PASSWD},
+				{silently_accept_hosts, true}]).
+
+%%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
 prep(Config) ->
diff --git a/lib/ssh/test/ssh_to_openssh_SUITE.erl b/lib/ssh/test/ssh_to_openssh_SUITE.erl
index 99dc76e12d..75e73712f1 100644
--- a/lib/ssh/test/ssh_to_openssh_SUITE.erl
+++ b/lib/ssh/test/ssh_to_openssh_SUITE.erl
@@ -49,7 +49,9 @@ groups() ->
 			  erlang_client_openssh_server_setenv,
 			  erlang_client_openssh_server_publickey_rsa,
 			  erlang_client_openssh_server_publickey_dsa,
-			  erlang_client_openssh_server_password]},
+			  erlang_client_openssh_server_password,
+			  erlang_client_openssh_server_nonexistent_subsystem
+			 ]},
      {erlang_server, [], [erlang_server_openssh_client_exec,
 			  erlang_server_openssh_client_exec_compressed,
 			  erlang_server_openssh_client_pulic_key_dsa]}
@@ -402,6 +404,20 @@ erlang_client_openssh_server_password(Config) when is_list(Config) ->
 	end.
 
 %%--------------------------------------------------------------------
+
+erlang_client_openssh_server_nonexistent_subsystem() ->
+    [{doc, "Test client password option"}].
+erlang_client_openssh_server_nonexistent_subsystem(Config) when is_list(Config) ->
+
+    ConnectionRef = ssh_test_lib:connect(?SSH_DEFAULT_PORT,
+					 [{user_interaction, false},
+					  silently_accept_hosts]),
+
+    {ok, ChannelId} = ssh_connection:session_channel(ConnectionRef, infinity),
+
+    failure = ssh_connection:subsystem(ConnectionRef, ChannelId, "foo", infinity).
+
+%%--------------------------------------------------------------------
 %
 %% Not possible to send password with openssh without user interaction
 %%