Merge branch 'maint'

* maint:
  Ssh appup modifications
  Updated appup for ssh
  Bumped revision
  Removed some testing variables
  ssh_opts is now a proper list
  After auth rsa and dsa passwords is set to undefined
  Removing the password after auth

2 files changed, 53 insertions, 2 deletions

diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index d08dbafc32..8914aeffdb 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,10 +19,15 @@
 
 {"%VSN%",	
  [
+ {<<"2.1.1">>, [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+	      {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
+	      {load_module, ssh_auth, soft_purge, soft_purge, []},
+	      {load_module, ssh, soft_purge, soft_purge, []}]},
  {<<"2.1">>, [{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []},
 	      {load_module, ssh_connection, soft_purge, soft_purge, []},
 	      {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
 	      {load_module, ssh_auth, soft_purge, soft_purge, []},
+	      {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
 	      {load_module, ssh_channel, soft_purge, soft_purge, []},
 	      {load_module, ssh_file, soft_purge, soft_purge, []}]},
 	      {load_module, ssh, soft_purge, soft_purge, []}]},
@@ -30,14 +35,19 @@
   {<<"1\\.*">>, [{restart_application, ssh}]}
  ],
  [
+  {<<"2.1.1">>, [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
+	      {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
+	      {load_module, ssh_auth, soft_purge, soft_purge, []},
+	      {load_module, ssh, soft_purge, soft_purge, []}]},
   {<<"2.1">>,[{load_module, ssh_sftpd_file_api, soft_purge, soft_purge, []},
 	      {load_module, ssh_connection, soft_purge, soft_purge, []},
 	      {load_module, ssh_connection_manager, soft_purge, soft_purge, []},
 	      {load_module, ssh_auth, soft_purge, soft_purge, []},
+	      {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
 	      {load_module, ssh_channel, soft_purge, soft_purge, []},
 	      {load_module, ssh_file, soft_purge, soft_purge, []}]},
 	      {load_module, ssh, soft_purge, soft_purge, []}]},
   {<<"2.0\\.*">>, [{restart_application, ssh}]},
   {<<"1\\.*">>, [{restart_application, ssh}]}
  ]
-}.
+}.
\ No newline at end of file
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index 422d9356d5..513b0f86c7 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.erl
@@ -536,7 +536,7 @@ handle_info({same_user, _}, State) ->
 handle_info(ssh_connected, #state{role = client, client = Pid} 
 	    = State) ->
     Pid ! {self(), is_connected},
-    {noreply, State#state{connected = true}};
+    {noreply, State#state{connected = true, opts = handle_password(State#state.opts)}};
 
 handle_info(ssh_connected, #state{role = server} = State) ->
     {noreply, State#state{connected = true}};
@@ -549,6 +549,47 @@ handle_info({'DOWN', _Ref, process, ChannelPid, _Reason}, State) ->
 handle_info({'EXIT', _Sup, Reason}, State) ->
     {stop, Reason, State}.
 
+handle_password(Opts) ->
+    handle_rsa_password(handle_dsa_password(handle_normal_password(Opts))).
+handle_normal_password(Opts) ->
+    case proplists:get_value(ssh_opts, Opts, false) of
+	false ->
+	    Opts;
+	SshOpts ->
+	    case proplists:get_value(password, SshOpts, false) of
+		false ->
+		    Opts;
+		_Password ->
+		    NewOpts = [{password, undefined}|lists:keydelete(password, 1, SshOpts)],
+		    [{ssh_opts, NewOpts}|lists:keydelete(ssh_opts, 1, Opts)]
+	    end
+    end.
+handle_dsa_password(Opts) ->
+    case proplists:get_value(ssh_opts, Opts, false) of
+	false ->
+	    Opts;
+	SshOpts ->
+	    case proplists:get_value(dsa_pass_phrase, SshOpts, false) of
+		false ->
+		    Opts;
+		_Password ->
+		    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) ->
+    case proplists:get_value(ssh_opts, Opts, false) of
+	false ->
+	    Opts;
+	SshOpts ->
+	    case proplists:get_value(rsa_pass_phrase, SshOpts, false) of
+		false ->
+		    Opts;
+		_Password ->
+		    NewOpts = [{rsa_pass_phrase, undefined}|lists:keydelete(rsa_pass_phrase, 1, SshOpts)],
+		    [{ssh_opts, NewOpts}|lists:keydelete(ssh_opts, 1, Opts)]
+	    end
+    end.
 %%--------------------------------------------------------------------
 %% Function: terminate(Reason, State) -> void()
 %% Description: This function is called by a gen_server when it is about to