aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2018-04-06 12:21:01 +0200
committerHans Nilsson <[email protected]>2018-04-06 12:21:01 +0200
commit61bc7c7d1ac9ff621b3125d79ae4a9a3dd6b1622 (patch)
treeb04a96a35dd4d06d1f936717fc5b8bd7cfbb3bcc /lib/ssh/src
parent6b31b88f74bf7194bed5df72eeabda3cc645a39c (diff)
parent90edf69ba7acbfaa55a709fa115ce8bb782b9dc9 (diff)
downloadotp-61bc7c7d1ac9ff621b3125d79ae4a9a3dd6b1622.tar.gz
otp-61bc7c7d1ac9ff621b3125d79ae4a9a3dd6b1622.tar.bz2
otp-61bc7c7d1ac9ff621b3125d79ae4a9a3dd6b1622.zip
Merge branch 'maint-19' into maint
* maint-19: Updated OTP version Prepare release ssh: Fix ssh_sftpd:handle_op not returning State Conflicts: OTP_VERSION lib/ssh/doc/src/notes.xml lib/ssh/vsn.mk otp_versions.table
Diffstat (limited to 'lib/ssh/src')
-rw-r--r--lib/ssh/src/ssh_sftpd.erl6
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl
index 427edf01ab..a9136e5614 100644
--- a/lib/ssh/src/ssh_sftpd.erl
+++ b/lib/ssh/src/ssh_sftpd.erl
@@ -360,10 +360,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},