aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-11-28 11:48:11 +0100
committerFredrik Gustafsson <[email protected]>2012-11-28 11:48:11 +0100
commit3b697a2e0de3dc02461d811b8714ad91470b9e2c (patch)
treeb8f23ab41954eb8001cb499de20f9c6730a8b856
parent3051d7a5833eb8cd4903a5fec749549de27a3c8d (diff)
downloadotp-3b697a2e0de3dc02461d811b8714ad91470b9e2c.tar.gz
otp-3b697a2e0de3dc02461d811b8714ad91470b9e2c.tar.bz2
otp-3b697a2e0de3dc02461d811b8714ad91470b9e2c.zip
changed option to sftpd_vsn
-rw-r--r--lib/ssh/src/ssh.erl4
-rw-r--r--lib/ssh/src/ssh_sftpd.erl2
-rw-r--r--lib/ssh/test/ssh_sftpd_SUITE.erl2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 22c55f8bf0..e089dd20bd 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -364,7 +364,7 @@ handle_option([{quiet_mode, _} = Opt|Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
handle_option([{idle_time, _} = Opt | Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
-handle_option([{sftp_vsn, _} = Opt | Rest], SocketOptions, SshOptions) ->
+handle_option([{sftpd_vsn, _} = Opt | Rest], SocketOptions, SshOptions) ->
handle_option(Rest, SocketOptions, [handle_ssh_option(Opt) | SshOptions]);
handle_option([Opt | Rest], SocketOptions, SshOptions) ->
handle_option(Rest, [handle_inet_option(Opt) | SocketOptions], SshOptions).
@@ -442,7 +442,7 @@ handle_ssh_option({quiet_mode, Value} = Opt) when Value == true;
Opt;
handle_ssh_option({idle_time, Value} = Opt) when is_integer(Value), Value > 0 ->
Opt;
-handle_ssh_option({sftp_vsn, Value} = Opt) when is_integer(Value), Value > 0, Value < 7 ->
+handle_ssh_option({sftpd_vsn, Value} = Opt) when is_integer(Value), Value =:= 6 ->
Opt;
handle_ssh_option(Opt) ->
throw({error, {eoptions, Opt}}).
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl
index 21ba98a3e1..d4d6e4a9a7 100644
--- a/lib/ssh/src/ssh_sftpd.erl
+++ b/lib/ssh/src/ssh_sftpd.erl
@@ -119,7 +119,7 @@ init(Options) ->
{Root0, State0}
end,
MaxLength = proplists:get_value(max_files, Options, 0),
- Vsn = proplists:get_value(sftp_vsn, Options, 5),
+ Vsn = proplists:get_value(sftpd_vsn, Options, 5),
{ok, State#state{cwd = CWD, root = Root, max_files = MaxLength,
handles = [], pending = <<>>,
xf = #ssh_xfer{vsn = Vsn, ext = []}}}.
diff --git a/lib/ssh/test/ssh_sftpd_SUITE.erl b/lib/ssh/test/ssh_sftpd_SUITE.erl
index ab6ff4cac2..9877d39ec4 100644
--- a/lib/ssh/test/ssh_sftpd_SUITE.erl
+++ b/lib/ssh/test/ssh_sftpd_SUITE.erl
@@ -114,7 +114,7 @@ init_per_testcase(TestCase, Config) ->
{user_dir, PrivDir},
{user_passwords,[{?USER, ?PASSWD}]},
{pwdfun, fun(_,_) -> true end},
- {sftp_vsn, 6}]);
+ {sftpd_vsn, 6}]);
_ ->
ssh_sftpd:listen(Port, [{system_dir, SystemDir},
{user_dir, PrivDir},