diff options
| author | Ingela Anderton Andin <[email protected]> | 2014-10-06 16:59:22 +0200 |
|---|---|---|
| committer | Ingela Anderton Andin <[email protected]> | 2014-10-09 16:18:09 +0200 |
| commit | b6bbdb3a10e2e6aaa4d346dfe7c8917e52bd1c17 (patch) | |
| tree | 58c1079882c355c746db37c5ed652b294576c67f /lib/ssh/src/ssh_io.erl | |
| parent | ee24a87a779d8d10461cadd47b3eb276e70baef8 (diff) | |
| download | otp-b6bbdb3a10e2e6aaa4d346dfe7c8917e52bd1c17.tar.gz otp-b6bbdb3a10e2e6aaa4d346dfe7c8917e52bd1c17.tar.bz2 otp-b6bbdb3a10e2e6aaa4d346dfe7c8917e52bd1c17.zip | |
ssh: Fix option user_interaction to work as expected
When password authentication is implemented with ssh
keyboard-interactive method and the password is already supplied, so
that we do not need to query the user, connections should
succeed even though the user_interaction option is set to false.
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). |