diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-07-01 16:34:52 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-07-01 16:34:52 +0200 |
| commit | b869f69e056c1e9d8850c51bb51fca03aa7d5962 (patch) | |
| tree | 34e526bf2f1d2362903cf88712328f51ce471c73 /lib/ssh | |
| parent | cc6e4b6ce7c2c82fb3039a9e6d46a2c90fd45cf2 (diff) | |
| parent | adc8b048e72ad774a431b32088b4df8b47d509f8 (diff) | |
| download | otp-b869f69e056c1e9d8850c51bb51fca03aa7d5962.tar.gz otp-b869f69e056c1e9d8850c51bb51fca03aa7d5962.tar.bz2 otp-b869f69e056c1e9d8850c51bb51fca03aa7d5962.zip | |
Merge branch 'maint-r16' into maint
Diffstat (limited to 'lib/ssh')
| -rw-r--r-- | lib/ssh/doc/src/notes.xml | 15 | ||||
| -rw-r--r-- | lib/ssh/src/ssh_connection_handler.erl | 3 |
2 files changed, 15 insertions, 3 deletions
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml index 8e112433c1..299dd5058a 100644 --- a/lib/ssh/doc/src/notes.xml +++ b/lib/ssh/doc/src/notes.xml @@ -195,8 +195,6 @@ </item> </list> </section> - - <section><title>Improvements and New Features</title> <list> <item> @@ -251,7 +249,20 @@ </section> </section> +<section><title>Ssh 2.1.2.1</title> +<section><title>Improvements and New Features</title> + <list> + <item> + <p> + Removed error report in ssh_connection_handler triggered + by badmatch failure.</p> + <p> + Own Id: OTP-11188</p> + </item> + </list> + </section> +</section> <section><title>Ssh 2.1.2</title> <section><title>Fixed Bugs and Malfunctions</title> diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl index 1c4477aeb3..df6175e27c 100644 --- a/lib/ssh/src/ssh_connection_handler.erl +++ b/lib/ssh/src/ssh_connection_handler.erl @@ -451,11 +451,12 @@ userauth(#ssh_msg_userauth_failure{authentications = Methodes}, case ssh_auth:userauth_request_msg(Ssh1) of {disconnect, DisconnectMsg, {Msg, Ssh}} -> send_msg(Msg, State), - handle_disconnect(DisconnectMsg, State#state{ssh_params = Ssh}); + 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) -> |