aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFredrik Gustafsson <[email protected]>2013-01-18 10:34:07 +0100
committerFredrik Gustafsson <[email protected]>2013-01-18 10:34:07 +0100
commit1f53eb8d0fb0b4953c3a9cca230c0be9b908661e (patch)
tree12591ed5223337b9cd1d7940ef821d2de0441b78
parentb5e456083979a25404670feb3fb7f977cbe32d8b (diff)
downloadotp-1f53eb8d0fb0b4953c3a9cca230c0be9b908661e.tar.gz
otp-1f53eb8d0fb0b4953c3a9cca230c0be9b908661e.tar.bz2
otp-1f53eb8d0fb0b4953c3a9cca230c0be9b908661e.zip
Fixed internal error on when client and server can not agree o which authmethod to use
-rw-r--r--lib/ssh/src/ssh_connection_handler.erl14
1 files changed, 9 insertions, 5 deletions
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 88b45111ff..9378686242 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -422,11 +422,15 @@ userauth(#ssh_msg_userauth_failure{authentications = Methodes},
#state{ssh_params = #ssh{role = client,
userauth_methods = none} = Ssh0} = State) ->
AuthMethods = string:tokens(Methodes, ","),
- {Msg, Ssh} = ssh_auth:userauth_request_msg(
- Ssh0#ssh{userauth_methods = AuthMethods}),
- send_msg(Msg, State),
- {next_state, userauth, next_packet(State#state{ssh_params = Ssh})};
-
+ Ssh1 = Ssh0#ssh{userauth_methods = AuthMethods},
+ case ssh_auth:userauth_request_msg(Ssh1) of
+ {disconnect, DisconnectMsg, {Msg, Ssh}} ->
+ send_msg(Msg, State),
+ handle_disconnect(DisconnectMsg, State#state{ssh_params = Ssh});
+ {Msg, Ssh} ->
+ send_msg(Msg, State),
+ {next_state, userauth, next_packet(State#state{ssh_params = Ssh})}
+ end;
%% The prefered authentication method failed try next method
userauth(#ssh_msg_userauth_failure{},
#state{ssh_params = #ssh{role = client} = Ssh0} = State) ->