diff options
author | Hans Nilsson <[email protected]> | 2014-10-15 14:57:08 +0200 |
---|---|---|
committer | Hans Nilsson <[email protected]> | 2014-10-15 14:57:08 +0200 |
commit | 7b2760a6f9991d754687a81c51410c2282ff0b07 (patch) | |
tree | fe76c5ab10c16e065f1ffa907de67e8c575c5f97 /lib/ssh/src/ssh_message.erl | |
parent | 7c4237e6d34b23020fca983731a3c7f07a10a8b5 (diff) | |
parent | 647c0e162fafcdc1810eb25b2f67fe6adee38ced (diff) | |
download | otp-7b2760a6f9991d754687a81c51410c2282ff0b07.tar.gz otp-7b2760a6f9991d754687a81c51410c2282ff0b07.tar.bz2 otp-7b2760a6f9991d754687a81c51410c2282ff0b07.zip |
Merge branch 'maint'
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, |