From 647ef86cd72d5646eda0901f59a68e3bd4878a9f Mon Sep 17 00:00:00 2001 From: Ingela Anderton Andin Date: Thu, 2 Feb 2012 14:14:16 +0100 Subject: Ssh daemon handles RSA host keys Solves OTP-7677 --- lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl') diff --git a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl index ca189d4b02..4c469ed5f7 100644 --- a/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl +++ b/lib/ssh/test/ssh_sftpd_erlclient_SUITE.erl @@ -90,7 +90,7 @@ end_per_suite(Config) -> init_per_testcase(TestCase, Config) -> ssh:start(), PrivDir = ?config(priv_dir, Config), - DataDir = ?config(data_dir, Config), + SystemDir = filename:join(PrivDir, system), Options = case atom_to_list(TestCase) of @@ -98,7 +98,7 @@ init_per_testcase(TestCase, Config) -> Spec = ssh_sftpd:subsystem_spec([{file_handler, ssh_sftpd_file_alt}]), - [{system_dir, DataDir}, + [{system_dir, SystemDir}, {user_dir, PrivDir}, {subsystems, [Spec]}]; "root_dir" -> @@ -106,19 +106,19 @@ init_per_testcase(TestCase, Config) -> Root = filename:join(Privdir, root), file:make_dir(Root), Spec = ssh_sftpd:subsystem_spec([{root,Root}]), - [{system_dir, DataDir}, + [{system_dir, SystemDir}, {user_dir, PrivDir}, {subsystems, [Spec]}]; "list_dir_limited" -> Spec = ssh_sftpd:subsystem_spec([{max_files,1}]), - [{system_dir, DataDir}, + [{system_dir, SystemDir}, {user_dir, PrivDir}, {subsystems, [Spec]}]; _ -> [{user_dir, PrivDir}, - {system_dir, DataDir}] + {system_dir, SystemDir}] end, {Sftpd, Host, Port} = ssh_test_lib:daemon(Options), -- cgit v1.2.3