diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-07-01 16:35:05 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-07-01 16:35:05 +0200 |
| commit | edaec031fc06bbd6eaacc409fbd43a006f5e3501 (patch) | |
| tree | c9bf70a12030bd65b84918cc2fc263ba821d2d07 /lib/ssh | |
| parent | 4b279e0482e826c1e2177d3ca4ff4db7f05cd608 (diff) | |
| parent | b869f69e056c1e9d8850c51bb51fca03aa7d5962 (diff) | |
| download | otp-edaec031fc06bbd6eaacc409fbd43a006f5e3501.tar.gz otp-edaec031fc06bbd6eaacc409fbd43a006f5e3501.tar.bz2 otp-edaec031fc06bbd6eaacc409fbd43a006f5e3501.zip | |
Merge branch '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 e2dbfa04f7..6b7ff7b238 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) -> |