diff options
| author | Erlang/OTP <[email protected]> | 2018-04-05 15:10:24 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2018-04-05 15:10:24 +0200 |
| commit | 3d2399c50001209544a5ae053b07e1ba6625fff8 (patch) | |
| tree | 8a5f4ba9b7bc17bb414b075cd549887d3a8ebead | |
| parent | bf70d8de7a6c52cb3ba51ae3e5506d8fc31bbc69 (diff) | |
| parent | 480b36688d6470b35b59c4efed52348acdb05b30 (diff) | |
| download | otp-3d2399c50001209544a5ae053b07e1ba6625fff8.tar.gz otp-3d2399c50001209544a5ae053b07e1ba6625fff8.tar.bz2 otp-3d2399c50001209544a5ae053b07e1ba6625fff8.zip | |
Merge branch 'hans/ssh/sftpd_rm_dir_err_19/OTP-15004' into maint-19
* hans/ssh/sftpd_rm_dir_err_19/OTP-15004:
ssh: Fix ssh_sftpd:handle_op not returning State
| -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 fb680fe11c..8589730438 100644 --- a/lib/ssh/src/ssh_sftpd.erl +++ b/lib/ssh/src/ssh_sftpd.erl @@ -384,10 +384,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}, |