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_io.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_io.erl')
| -rw-r--r-- | lib/ssh/src/ssh_io.erl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/ssh/src/ssh_io.erl b/lib/ssh/src/ssh_io.erl index 35336bce8b..97e2dee27a 100644 --- a/lib/ssh/src/ssh_io.erl +++ b/lib/ssh/src/ssh_io.erl @@ -1,7 +1,7 @@ %% %% %CopyrightBegin% %% -%% Copyright Ericsson AB 2005-2013. All Rights Reserved. +%% Copyright Ericsson AB 2005-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 @@ -73,7 +73,9 @@ read_password(Prompt, Ssh) -> listify(A) when is_atom(A) -> atom_to_list(A); listify(L) when is_list(L) -> - L. + L; +listify(B) when is_binary(B) -> + binary_to_list(B). format(Fmt, Args) -> io:format(Fmt, Args). |