Merge branch 'fredrik/ssh/sftp-file-is-dir/OTP-6406'

* fredrik/ssh/sftp-file-is-dir/OTP-6406:
  Removed unused code ssh.erl and changed tests
  Added eexist to return proper sftp parameter
  Changed erlclient testcases for sftp
  sftp ver6 mods, SSH_FX_CANNOT_DELETE added as parameter
  Updated doc for sftpd_vsn
  Changed testcases to proper sftpd listening
  changed option to sftpd_vsn
  corrected is_dir call in sftpd
  Changes to sftpd test suite
  Added a file_is_a_directory to a proper status return
  Basic functionality for sftp ver6 and testcase

Conflicts:
	lib/ssh/doc/src/ssh_sftpd.xml

3 files changed, 46 insertions, 13 deletions

diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index b995eb9f0e..5aa46872ee 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -58,7 +58,8 @@ all() ->
      links,
      ver3_rename, 
      relpath, 
-     sshd_read_file].
+     sshd_read_file,
+     ver6_basic].
 
 groups() -> 
     [].
@@ -106,12 +107,18 @@ init_per_testcase(TestCase, Config) ->
     SystemDir = filename:join(?config(priv_dir, Config), system),
 
     Port = ssh_test_lib:inet_port(node()),
-
-    {ok, Sftpd} =
-	ssh_sftpd:listen(Port, [{system_dir, SystemDir},
-				      {user_dir, PrivDir},
-				      {user_passwords,[{?USER, ?PASSWD}]},
-				      {pwdfun, fun(_,_) -> true end}]),
+    Options = [{system_dir, SystemDir},
+	       {user_dir, PrivDir},
+	       {user_passwords,[{?USER, ?PASSWD}]},
+	       {pwdfun, fun(_,_) -> true end}],
+    {ok, Sftpd} = case TestCase of
+		      ver6_basic ->
+			  SubSystems = [ssh_sftpd:subsystem_spec([{sftpd_vsn, 6}])],
+			  ssh:daemon(Port, [{subsystems, SubSystems}|Options]);
+		      _ ->
+			  SubSystems = [ssh_sftpd:subsystem_spec([])],
+			  ssh:daemon(Port, [{subsystems, SubSystems}|Options])
+		  end,
     
     Cm = ssh_test_lib:connect(Port,
 			      [{user_dir, ClientUserDir},
@@ -341,7 +348,7 @@ mk_rm_dir(Config) when is_list(Config) ->
 	  _/binary>>, _} = mkdir(DirName, Cm, Channel, ReqId),
 
     NewReqId = 1,
-    {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId), ?UINT32(?SSH_FX_FAILURE),
+    {ok, <<?SSH_FXP_STATUS, ?UINT32(NewReqId), ?UINT32(?SSH_FX_FILE_ALREADY_EXISTS),
 	  _/binary>>, _} = mkdir(DirName, Cm, Channel, NewReqId),
 
     NewReqId1 = 2,
@@ -591,7 +598,18 @@ sshd_read_file(Config) when is_list(Config) ->
 	read_file(Handle, 100, 0, Cm, Channel, NewReqId),
 
     {ok, Data} = file:read_file(FileName).
-
+ver6_basic(doc) ->
+    ["Test SFTP Version 6"];
+ver6_basic(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    %FileName = filename:join(PrivDir, "test.txt"),
+    {Cm, Channel} = ?config(sftp, Config),
+    ReqId = 0,
+    {ok, <<?SSH_FXP_STATUS, ?UINT32(ReqId),  % Ver 6 we have 5
+	   ?UINT32(?SSH_FX_FILE_IS_A_DIRECTORY), _/binary>>, _} =
+	open_file(PrivDir, Cm, Channel, ReqId,
+		  ?ACE4_READ_DATA  bor ?ACE4_READ_ATTRIBUTES,
+		  ?SSH_FXF_OPEN_EXISTING).
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
index 7fc2312661..8f722941d4 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl
@@ -42,7 +42,8 @@ all() ->
      quit, 
      file_cb,
      root_dir, 
-     list_dir_limited].
+     list_dir_limited,
+     ver6_basic].
 
 groups() -> 
     [].
@@ -112,7 +113,12 @@ init_per_testcase(TestCase, Config) ->
 		[{system_dir, SystemDir},
 		 {user_dir, PrivDir},
 		 {subsystems, [Spec]}];
-
+	    "ver6_basic" ->
+		Spec =
+		    ssh_sftpd:subsystem_spec([{sftpd_vsn, 6}]),
+		[{system_dir, SystemDir},
+		 {user_dir, PrivDir},
+		 {subsystems, [Spec]}];
 	    _ ->
 		[{user_dir, PrivDir},
 		 {system_dir, SystemDir}]
@@ -232,7 +238,7 @@ file_cb(Config) when is_list(Config) ->
     NewDir = filename:join(PrivDir, "testdir"),
     ok =  ssh_sftp:make_dir(Sftp, NewDir),
     alt_file_handler_check(alt_make_dir),
-
+	
     ok = ssh_sftp:del_dir(Sftp, NewDir),
     alt_file_handler_check(alt_read_link_info),
     alt_file_handler_check(alt_write_file_info),
@@ -260,6 +266,15 @@ list_dir_limited(Config) when is_list(Config) ->
 	ssh_sftp:list_dir(Sftp, "."),
     ct:pal("Listing: ~p~n", [Listing]).
 
+ver6_basic(doc) ->
+    ["Test some version 6 features"];
+ver6_basic(Config) when is_list(Config) ->
+    PrivDir =  ?config(priv_dir, Config),
+    NewDir = filename:join(PrivDir, "testdir2"),
+    {Sftp, _} = ?config(sftp, Config),
+    ok =  ssh_sftp:make_dir(Sftp, NewDir),
+    %%Test file_is_a_directory
+    {error, file_is_a_directory} = ssh_sftp:delete(Sftp, NewDir).
 %%--------------------------------------------------------------------
 %% Internal functions ------------------------------------------------
 %%--------------------------------------------------------------------
diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/ssh_sftpd_file_alt.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/ssh_sftpd_file_alt.erl
index 9e119c4929..9f8a7c496c 100644
--- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/ssh_sftpd_file_alt.erl
+++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE_data/ssh_sftpd_file_alt.erl
@@ -48,7 +48,7 @@ get_cwd(State) ->
     {file:get_cwd(), State}.
 
 is_dir(AbsPath, State) ->
-    sftpd_file_alt_tester ! alt_is_dir,
+    %sftpd_file_alt_tester ! alt_is_dir,
     {filelib:is_dir(AbsPath), State}.
 
 list_dir(AbsPath, State) ->