aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2018-06-21 17:32:59 +0200
committerErlang/OTP <[email protected]>2018-06-21 17:32:59 +0200
commit6e6debe47adb967ebba4d05bc7c40f7be190561b (patch)
tree9be07f388553cdf4e3ea310754c26e5774f9af8c /lib/ssh
parent0b8b20d92795d3fad9e2f1903044b37d28b7092a (diff)
parentfef7ad89ab1802114f9c69709a1227fac92aa6a0 (diff)
downloadotp-6e6debe47adb967ebba4d05bc7c40f7be190561b.tar.gz
otp-6e6debe47adb967ebba4d05bc7c40f7be190561b.tar.bz2
otp-6e6debe47adb967ebba4d05bc7c40f7be190561b.zip
Merge branch 'hans/ssh/sftp_ver4_xfer/ERIERL-199/OTP-15149' into maint-20
* hans/ssh/sftp_ver4_xfer/ERIERL-199/OTP-15149: ssh: Fix ssh_xfer decode_ATTR error for Vsn=4
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/src/ssh_xfer.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_xfer.erl b/lib/ssh/src/ssh_xfer.erl
index e1680c120e..7bb9c2d101 100644
--- a/lib/ssh/src/ssh_xfer.erl
+++ b/lib/ssh/src/ssh_xfer.erl
@@ -734,7 +734,7 @@ decode_ATTR(Vsn, <<?UINT32(Flags), Tail/binary>>) ->
{Type,Tail2} =
if Vsn =< 3 ->
{?SSH_FILEXFER_TYPE_UNKNOWN, Tail};
- Vsn >= 5 ->
+ true ->
<<?BYTE(T), TL/binary>> = Tail,
{T, TL}
end,