aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2012-10-25 10:34:15 +0200
committerFredrik Gustafsson <[email protected]>2012-11-05 15:43:14 +0100
commit6a37d426a3f85a59adf8769d65b009012fa7d701 (patch)
tree752b2a9e74806b28b9718021d362dfa062a56e04 /lib/ssh
parent161ddec59071e77bf6fc49db9dd867aa0e0e1268 (diff)
downloadotp-6a37d426a3f85a59adf8769d65b009012fa7d701.tar.gz
otp-6a37d426a3f85a59adf8769d65b009012fa7d701.tar.bz2
otp-6a37d426a3f85a59adf8769d65b009012fa7d701.zip
ssh_opts is now a proper list
Diffstat (limited to 'lib/ssh')
-rw-r--r--lib/ssh/src/ssh_connection_manager.erl12
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index 16a31459e7..dd31fe4760 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -548,7 +548,7 @@ handle_normal_password(Opts) ->
Opts;
_Password ->
NewOpts = [{password, undefined}|lists:keydelete(password, 1, SshOpts)],
- lists:merge(NewOpts, lists:keydelete(ssh_opts, 1, Opts))
+ [{ssh_opts, NewOpts}|lists:keydelete(ssh_opts, 1, Opts)]
end
end.
handle_dsa_password(Opts) ->
@@ -560,11 +560,12 @@ handle_dsa_password(Opts) ->
false ->
Opts;
_Password ->
- NewOpts = [{dsa_pass_phase, undefined}|lists:keydelete(password, 1, SshOpts)],
- lists:merge(NewOpts, lists:keydelete(ssh_opts, 1, Opts))
+ NewOpts = [{dsa_pass_phrase, undefined}|lists:keydelete(dsa_pass_phrase, 1, SshOpts)],
+ [{ssh_opts, NewOpts}|lists:keydelete(ssh_opts, 1, Opts)]
end
end.
handle_rsa_password(Opts) ->
+ io:format("rsa"),
case proplists:get_value(ssh_opts, Opts, false) of
false ->
Opts;
@@ -573,8 +574,9 @@ handle_rsa_password(Opts) ->
false ->
Opts;
_Password ->
- NewOpts = [{rsa_pass_phase, undefined}|lists:keydelete(password, 1, SshOpts)],
- lists:merge(NewOpts, lists:keydelete(ssh_opts, 1, Opts))
+ io:format("rsa_2"),
+ NewOpts = [{rsa_pass_phrase, undefined}|lists:keydelete(rsa_pass_phrase, 1, SshOpts)],
+ [{ssh_opts, NewOpts}|lists:keydelete(ssh_opts, 1, Opts)]
end
end.
%%--------------------------------------------------------------------