aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2019-01-07 12:04:55 +0100
committerGitHub <[email protected]>2019-01-07 12:04:55 +0100
commit536bd25f37b66537a7006498504aa04af91d2ef3 (patch)
tree75f5b5b452e431300096d9c9b2c22a550738aa19
parent9d5806b9215b733fdaa44c8be3c53fbdf3e8f7b0 (diff)
parent7b8c8ba289125a52d4dfca2da506e2063cb99d0e (diff)
downloadotp-536bd25f37b66537a7006498504aa04af91d2ef3.tar.gz
otp-536bd25f37b66537a7006498504aa04af91d2ef3.tar.bz2
otp-536bd25f37b66537a7006498504aa04af91d2ef3.zip
Merge pull request #2077 from KryoStoffer/maint
ERL-822 Fix sftpd interop for SSH_FXP_STAT OTP-15498
-rw-r--r--lib/ssh/src/ssh_sftpd.erl7
1 files changed, 2 insertions, 5 deletions
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl
index 278f6a9780..aa9ba0f9bb 100644
--- a/lib/ssh/src/ssh_sftpd.erl
+++ b/lib/ssh/src/ssh_sftpd.erl
@@ -508,11 +508,8 @@ close_our_file({_,Fd}, FileMod, FS0) ->
FS1.
%%% stat: do the stat
-stat(Vsn, ReqId, Data, State, F) when Vsn =< 3->
- <<?UINT32(BLen), BPath:BLen/binary>> = Data,
- stat(ReqId, unicode:characters_to_list(BPath), State, F);
-stat(Vsn, ReqId, Data, State, F) when Vsn >= 4->
- <<?UINT32(BLen), BPath:BLen/binary, ?UINT32(_Flags)>> = Data,
+stat(Vsn, ReqId, Data, State, F) ->
+ <<?UINT32(BLen), BPath:BLen/binary, _/binary>> = Data,
stat(ReqId, unicode:characters_to_list(BPath), State, F).
fstat(Vsn, ReqId, Data, State) when Vsn =< 3->