5 files changed, 16 insertions, 8 deletions
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 826a11f1f4..cbd8166bb9 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,12 +19,14 @@
 
 {"%VSN%",	
  [
+  {<<"2.1.2">>, [{restart_application, ssh}]},
   {<<"2.1.1">>, [{restart_application, ssh}]},
   {<<"2.1">>, [{restart_application, ssh}]},
   {<<"2.0\\.*">>, [{restart_application, ssh}]},
   {<<"1\\.*">>, [{restart_application, ssh}]}
  ],
  [
+  {<<"2.1.2">>, [{restart_application, ssh}]},
   {<<"2.1.1">>, [{restart_application, ssh}]},
   {<<"2.1">>,[{restart_application, ssh}]},
   {<<"2.0\\.*">>, [{restart_application, ssh}]},
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 3ef26b1678..b5a0aa2e05 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -278,7 +278,9 @@ do_start_daemon(Host, Port, Options, SocketOptions) ->
 		{ok, SysSup} ->
 		    {ok, SysSup};
 		{error, {already_started, _}} ->
-		    {error, eaddrinuse}
+		    {error, eaddrinuse};
+		{error, R} ->
+		    {error, R}
 	    catch
 		exit:{noproc, _} ->
 		    {error, ssh_not_started}
diff --git a/lib/ssh/src/ssh_client_key_api.erl b/lib/ssh/src/ssh_client_key_api.erl
index eed0b85f47..58054a9fc5 100644
--- a/lib/ssh/src/ssh_client_key_api.erl
+++ b/lib/ssh/src/ssh_client_key_api.erl
@@ -26,7 +26,7 @@
 		      Algorithm :: 'ssh-rsa'| 'ssh-dss'| atom(), ConnectOptions :: proplists:proplist()) ->
     boolean().
 
--callback user_key(Algorithm ::  'ssh-rsa'| 'ssh-dss'| atom(), ConnectOptions :: proplists:proplists()) ->
+-callback user_key(Algorithm ::  'ssh-rsa'| 'ssh-dss'| atom(), ConnectOptions :: proplists:proplist()) ->
     {ok,  PrivateKey :: #'RSAPrivateKey'{}| #'DSAPrivateKey'{} |  term()} | {error, string()}.
 
 
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) ->
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 921ec2206a..71666a3179 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,5 +1,5 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 2.1.2
+SSH_VSN = 2.1.3
 APP_VSN    = "ssh-$(SSH_VSN)"