diff options
| author | Erlang/OTP <[email protected]> | 2014-10-13 09:38:50 +0200 |
|---|---|---|
| committer | Erlang/OTP <[email protected]> | 2014-10-13 09:38:50 +0200 |
| commit | c5d8b91af8011b82619f6ccca53a5a933ab91f7e (patch) | |
| tree | 6537af23600d4339d1670f5b7524a75322c56f31 /lib/ssh/src/ssh_message.erl | |
| parent | aebab2324285d3751c1ce73ad803be487ceb3a16 (diff) | |
| parent | 61f8ef381882eb0953b1e087d53894b88b356715 (diff) | |
| download | otp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.tar.gz otp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.tar.bz2 otp-c5d8b91af8011b82619f6ccca53a5a933ab91f7e.zip | |
Merge branch 'ia/patch-17/ssh/user-interaction/OTP-11329/sftp-version/OTP-12227' into maint-17
* ia/patch-17/ssh/user-interaction/OTP-11329/sftp-version/OTP-12227:
ssh: Prepare for release
ssh: Add option sftp_vsn
ssh: Fix option user_interaction to work as expected
Diffstat (limited to 'lib/ssh/src/ssh_message.erl')
| -rw-r--r-- | lib/ssh/src/ssh_message.erl | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/ssh/src/ssh_message.erl b/lib/ssh/src/ssh_message.erl index 76b57cb995..891ccec24c 100644 --- a/lib/ssh/src/ssh_message.erl +++ b/lib/ssh/src/ssh_message.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2013-2013. All Rights Reserved. +%% Copyright Ericsson AB 2013-2014. All Rights Reserved. %% %% The contents of this file are subject to the Erlang Public License, %% Version 1.1, (the "License"); you may not use this file except in @@ -162,8 +162,15 @@ encode(#ssh_msg_userauth_info_request{ encode(#ssh_msg_userauth_info_response{ num_responses = Num, data = Data}) -> - ssh_bits:encode([?SSH_MSG_USERAUTH_INFO_RESPONSE, Num, Data], - [byte, uint32, '...']); + Responses = lists:map(fun("") -> + <<>>; + (Response) -> + ssh_bits:encode([Response], [string]) + end, Data), + Start = ssh_bits:encode([?SSH_MSG_USERAUTH_INFO_RESPONSE, Num], + [byte, uint32]), + iolist_to_binary([Start, Responses]); + encode(#ssh_msg_disconnect{ code = Code, description = Desc, |