diff options
| author | Hans Nilsson <[email protected]> | 2019-01-07 12:09:11 +0100 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2019-01-07 12:09:11 +0100 |
| commit | 3f5c2d32d325668534beedea7d7b7accf0b30066 (patch) | |
| tree | 7c85635ba969370e8948fdd71878f57b661406aa /lib/ssh | |
| parent | bd1131fba3525599156ee685cdb8621b8e8d84a9 (diff) | |
| parent | 536bd25f37b66537a7006498504aa04af91d2ef3 (diff) | |
| download | otp-3f5c2d32d325668534beedea7d7b7accf0b30066.tar.gz otp-3f5c2d32d325668534beedea7d7b7accf0b30066.tar.bz2 otp-3f5c2d32d325668534beedea7d7b7accf0b30066.zip | |
Merge branch 'maint'
* maint:
Fix sftpd interop for SSH_FXP_STAT
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/src/ssh_sftpd.erl | 7 |
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-> |