diff options
| author | Hans Nilsson <[email protected]> | 2018-04-06 12:24:07 +0200 |
|---|---|---|
| committer | Hans Nilsson <[email protected]> | 2018-04-06 12:24:07 +0200 |
| commit | 83c66153ba03fabbe175efa3fdb400010c2dad98 (patch) | |
| tree | 1aad2a918449a895a9cfcbeb783710999fb534a7 /lib/ssh/src | |
| parent | 8e0a8ebe0a94cf7d313f9ab91674373a2b5ec8a2 (diff) | |
| parent | 61bc7c7d1ac9ff621b3125d79ae4a9a3dd6b1622 (diff) | |
| download | otp-83c66153ba03fabbe175efa3fdb400010c2dad98.tar.gz otp-83c66153ba03fabbe175efa3fdb400010c2dad98.tar.bz2 otp-83c66153ba03fabbe175efa3fdb400010c2dad98.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
ssh: Fix ssh_sftpd:handle_op not returning State
Diffstat (limited to 'lib/ssh/src')
| -rw-r--r-- | lib/ssh/src/ssh_sftpd.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl index 26cf2cb665..945e9f457b 100644 --- a/lib/ssh/src/ssh_sftpd.erl +++ b/lib/ssh/src/ssh_sftpd.erl @@ -362,10 +362,12 @@ handle_op(?SSH_FXP_REMOVE, ReqId, <<?UINT32(PLen), BPath:PLen/binary>>, case IsDir of %% This version 6 we still have ver 5 true when Vsn > 5 -> ssh_xfer:xf_send_status(State0#state.xf, ReqId, - ?SSH_FX_FILE_IS_A_DIRECTORY, "File is a directory"); + ?SSH_FX_FILE_IS_A_DIRECTORY, "File is a directory"), + State0; true -> ssh_xfer:xf_send_status(State0#state.xf, ReqId, - ?SSH_FX_FAILURE, "File is a directory"); + ?SSH_FX_FAILURE, "File is a directory"), + State0; false -> {Status, FS1} = FileMod:delete(Path, FS0), State1 = State0#state{file_state = FS1}, |