Merge branch 'maint-20' into maint

* maint-20:
  Updated OTP version
  Prepare release
  ssh: Report the signal name if there is an exit-signal to sftpd
  ssh: Bug fix sftp error codes
  ssh: Fix ssh_xfer decode_ATTR error for Vsn=4
  syntax_tools: Fix a bug regarding reverting map types.

Conflicts:
	OTP_VERSION
	lib/inets/doc/src/notes.xml
	lib/inets/vsn.mk
	lib/ssh/doc/src/notes.xml
	lib/ssh/vsn.mk
	lib/syntax_tools/doc/src/notes.xml
	lib/syntax_tools/vsn.mk
	otp_versions.table

1 files changed, 11 insertions, 2 deletions

diff --git a/lib/ssh/src/ssh_sftp.erl b/lib/ssh/src/ssh_sftp.erl
index 6e720a47b7..1b2ba5a50b 100644
--- a/lib/ssh/src/ssh_sftp.erl
+++ b/lib/ssh/src/ssh_sftp.erl
@@ -798,13 +798,22 @@ handle_ssh_msg({ssh_cm, _, {signal, _, _}}, State) ->
     %% Ignore signals according to RFC 4254 section 6.9.
     {ok, State};
 
-handle_ssh_msg({ssh_cm, _, {exit_signal, ChannelId, _, Error, _}},
+handle_ssh_msg({ssh_cm, _, {exit_signal, ChannelId, Signal, Error0, _}},
 	       State0) ->
+    Error =
+        case Error0 of
+            "" -> Signal;
+            _ -> Error0
+        end,
     State = reply_all(State0, {error, Error}),
     {stop, ChannelId,  State};
 
 handle_ssh_msg({ssh_cm, _, {exit_status, ChannelId, Status}}, State0) ->
-    State = reply_all(State0, {error, {exit_status, Status}}),
+    State = 
+        case State0 of
+            0 -> State0;
+            _ -> reply_all(State0, {error, {exit_status, Status}})
+        end,
     {stop, ChannelId, State}.
 
 %%--------------------------------------------------------------------