Merge branch 'maint-r14' into dev

6 files changed, 46 insertions, 47 deletions

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 224b9d4af7..4f546a37ed 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,20 @@
     <file>notes.xml</file>
   </header>
 
+<section><title>Ssh 2.0.6</title>
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+            A memory leak has been fixed. I.e. per terminated connection the size of
+            a pid and the length of a user name string was not cleared.</p>
+          <p>
+            Own Id: OTP-9232</p>
+        </item>
+      </list>
+    </section>
+</section>
+
 <section><title>Ssh 2.0.5</title>
     <section><title>Improvements and New Features</title>
       <list>
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 9be8c3c7d5..37f24e2463 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,44 +19,12 @@
 
 {"%VSN%",	
  [
-  {"2.0.4", [{load_module, ssh_bits, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
-  {"2.0.3", [{load_module, ssh_bits, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-             {load_module, ssh_file, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_rsa, soft_purge, soft_purge, []},
-             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
-             {load_module, ssh_transport, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
-  {"2.0.2", [{load_module, ssh_bits, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-             {load_module, ssh_file, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_rsa, soft_purge, soft_purge, []},
-             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
-             {load_module, ssh_transport, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}
+  {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]}
  ],
  [
-  {"2.0.4", [{load_module, ssh_bits, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
-  {"2.0.3", [{load_module, ssh_bits, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-             {load_module, ssh_file, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_rsa, soft_purge, soft_purge, []},
-             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
-             {load_module, ssh_transport, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
-  {"2.0.2", [{load_module, ssh_bits, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_handler, soft_purge, soft_purge, []},
-             {load_module, ssh_file, soft_purge, soft_purge, []},
-             {load_module, ssh, soft_purge, soft_purge, []},
-             {load_module, ssh_rsa, soft_purge, soft_purge, []},
-             {load_module, ssh_acceptor, soft_purge, soft_purge, []},
-             {load_module, ssh_transport, soft_purge, soft_purge, []},
-             {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]}
+  {"2.0.5", [{load_module, ssh_userreg, soft_purge, soft_purge, []},
+             {load_module, ssh_connection_handler, soft_purge, soft_purge, [ssh_userreg]}]}
  ]
 }.
 
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index cb78acb84c..781e01b9d1 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2005-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2005-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
diff --git a/lib/ssh/src/ssh_connection_handler.erl b/lib/ssh/src/ssh_connection_handler.erl
index 2d82e6d77d..3193be2510 100644
--- a/lib/ssh/src/ssh_connection_handler.erl
+++ b/lib/ssh/src/ssh_connection_handler.erl
@@ -578,7 +578,9 @@ handle_info({CloseTag, _Socket}, _StateName,
 %% Reason. The return value is ignored.
 %%--------------------------------------------------------------------
 terminate(normal, _, #state{transport_cb = Transport,
-			    socket = Socket}) ->
+			    socket = Socket,
+			    manager = Pid}) ->
+    (catch ssh_userreg:delete_user(Pid)),
     (catch Transport:close(Socket)),
     ok;
 
@@ -810,7 +812,7 @@ handle_disconnect(#ssh_msg_disconnect{} = Msg,
 		  #state{ssh_params = Ssh0, manager = Pid} = State) ->
     {SshPacket, Ssh} = ssh_transport:ssh_packet(Msg, Ssh0),
     try 
- 	send_msg(SshPacket, State),
+	send_msg(SshPacket, State),
  	ssh_connection_manager:event(Pid, Msg)
     catch
 	exit:{noproc, _Reason} ->
@@ -822,6 +824,7 @@ handle_disconnect(#ssh_msg_disconnect{} = Msg,
 				   [Msg, Exit]),
 	    error_logger:info_report(Report)
     end,
+    (catch ssh_userreg:delete_user(Pid)),
     {stop, normal, State#state{ssh_params = Ssh}}.
 
 counterpart_versions(NumVsn, StrVsn, #ssh{role = server} = Ssh) ->
diff --git a/lib/ssh/src/ssh_userreg.erl b/lib/ssh/src/ssh_userreg.erl
index 33c801f490..f901461aea 100644
--- a/lib/ssh/src/ssh_userreg.erl
+++ b/lib/ssh/src/ssh_userreg.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2011. All Rights Reserved.
 %%
 %% The contents of this file are subject to the Erlang Public License,
 %% Version 1.1, (the "License"); you may not use this file except in
@@ -25,11 +25,18 @@
 -behaviour(gen_server).
 
 %% API
--export([start_link/0, register_user/2, lookup_user/1]).
+-export([start_link/0,
+	 register_user/2,
+	 lookup_user/1,
+	 delete_user/1]).
 
 %% gen_server callbacks
--export([init/1, handle_call/3, handle_cast/2, handle_info/2,
-	 terminate/2, code_change/3]).
+-export([init/1,
+	 handle_call/3,
+	 handle_cast/2,
+	 handle_info/2,
+	 terminate/2,
+	 code_change/3]).
 
 -record(state, {user_db = []}).
 
@@ -46,6 +53,9 @@ start_link() ->
 register_user(User, Cm) ->
     gen_server:cast(?MODULE, {register, {User, Cm}}).
 
+delete_user(Cm) ->
+    gen_server:cast(?MODULE, {delete, Cm}).
+
 lookup_user(Cm) ->
     gen_server:call(?MODULE, {get_user, Cm}, infinity).
 
@@ -82,9 +92,10 @@ handle_call({get_user, Cm}, _From, #state{user_db = Db} = State) ->
 %%                                      {stop, Reason, State}
 %% Description: Handling cast messages
 %%--------------------------------------------------------------------
-handle_cast({register, UserCm}, State0) ->
-    State = insert(UserCm, State0),
-    {noreply, State}.
+handle_cast({register, UserCm}, State) ->
+    {noreply, insert(UserCm, State)};
+handle_cast({delete, UserCm}, State) ->
+    {noreply, delete(UserCm, State)}.
 
 %%--------------------------------------------------------------------
 %% Function: handle_info(Info, State) -> {noreply, State} |
@@ -118,6 +129,9 @@ code_change(_OldVsn, State, _Extra) ->
 insert({User, Cm}, #state{user_db = Db} = State) ->
     State#state{user_db = [{User, Cm} | Db]}.
 
+delete(Cm, #state{user_db = Db} = State) ->
+    State#state{user_db = lists:keydelete(Cm, 2, Db)}.
+
 lookup(_, []) ->
     undefined;
 lookup(Cm, [{User, Cm} | _Rest]) ->
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 8c9f671fd5..d0861b3ddc 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.0.5
+SSH_VSN = 2.0.6
 APP_VSN    = "ssh-$(SSH_VSN)"