aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_xfer.erl
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2014-10-13 09:38:50 +0200
committerErlang/OTP <[email protected]>2014-10-13 09:38:50 +0200
commitc5d8b91af8011b82619f6ccca53a5a933ab91f7e (patch)
tree6537af23600d4339d1670f5b7524a75322c56f31 /lib/ssh/src/ssh_xfer.erl
parentaebab2324285d3751c1ce73ad803be487ceb3a16 (diff)
parent61f8ef381882eb0953b1e087d53894b88b356715 (diff)
downloadotp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.tar.gz
otp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.tar.bz2
otp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.zip
Merge branch 'ia/patch-17/ssh/user-interaction/OTP-11329/sftp-version/OTP-12227' into maint-17
* ia/patch-17/ssh/user-interaction/OTP-11329/sftp-version/OTP-12227: ssh: Prepare for release ssh: Add option sftp_vsn ssh: Fix option user_interaction to work as expected
Diffstat (limited to 'lib/ssh/src/ssh_xfer.erl')
-rw-r--r--lib/ssh/src/ssh_xfer.erl8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/ssh/src/ssh_xfer.erl b/lib/ssh/src/ssh_xfer.erl
index 63d01fd9de..1881392db8 100644
--- a/lib/ssh/src/ssh_xfer.erl
+++ b/lib/ssh/src/ssh_xfer.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2005-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2014. All Rights Reserved.
%%
%% The contents of this file are subject to the Erlang Public License,
%% Version 1.1, (the "License"); you may not use this file except in
@@ -28,7 +28,7 @@
rename/5, remove/3, mkdir/4, rmdir/3, realpath/3, extended/4,
stat/4, fstat/4, lstat/4, setstat/4,
readlink/3, fsetstat/4, symlink/4,
- protocol_version_request/1,
+ protocol_version_request/2,
xf_reply/2,
xf_send_reply/3, xf_send_names/3, xf_send_name/4,
xf_send_status/3, xf_send_status/4, xf_send_status/5,
@@ -67,8 +67,8 @@ open_xfer(CM, Opts) ->
Error
end.
-protocol_version_request(XF) ->
- xf_request(XF, ?SSH_FXP_INIT, <<?UINT32(?SSH_SFTP_PROTOCOL_VERSION)>>).
+protocol_version_request(XF, Version) ->
+ xf_request(XF, ?SSH_FXP_INIT, <<?UINT32(Version)>>).
open(XF, ReqID, FileName, Access, Flags, Attrs) ->
Vsn = XF#ssh_xfer.vsn,