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_io.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_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). |