ssh: Adjust supervisor tree to make sure new listning

options are honored

3 files changed, 21 insertions, 18 deletions

diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 8a8d4bb89e..de047d3c83 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -234,22 +234,26 @@ do_start_daemon(Host, Port, Options, SocketOptions) ->
 				      {port, Port}, {role, server},
 				      {socket_opts, SocketOptions}, 
 				      {ssh_opts, Options}]) of
-		{ok, SysSup} ->
-		    {ok, SysSup};
 		{error, {already_started, _}} ->
 		    {error, eaddrinuse};
-		{error, R} ->
-		    {error, R}
+		Result = {Code, _} when (Code == ok) or (Code == error) ->
+		    Result
 	    catch
 		exit:{noproc, _} ->
 		    {error, ssh_not_started}
 	    end;
 	Sup  ->
-	    case ssh_system_sup:restart_acceptor(Host, Port) of
+	    AccPid = ssh_system_sup:acceptor_supervisor(Sup),
+	    case ssh_acceptor_sup:start_child(AccPid, [{address, Host},
+						       {port, Port}, {role, server},
+						       {socket_opts, SocketOptions},
+						       {ssh_opts, Options}]) of
+		{error, {already_started, _}} ->
+		    {error, eaddrinuse};
 		{ok, _} ->
 		    {ok, Sup};
-		_  ->
-		    {error, eaddrinuse}
+		Other ->
+		    Other
 	    end
     end.
 
diff --git a/lib/ssh/src/ssh_acceptor_sup.erl b/lib/ssh/src/ssh_acceptor_sup.erl
index 2be729d305..46fdef07d0 100644
--- a/lib/ssh/src/ssh_acceptor_sup.erl
+++ b/lib/ssh/src/ssh_acceptor_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. 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
@@ -26,7 +26,7 @@
 -module(ssh_acceptor_sup).
 -behaviour(supervisor).
 
--export([start_link/1, start_child/2, stop_child/2]).
+-export([start_link/1, start_child/2, stop_child/3]).
 
 %% Supervisor callback
 -export([init/1]).
@@ -45,18 +45,17 @@ start_child(AccSup, ServerOpts) ->
 	{error, already_present} ->
 	    Address = proplists:get_value(address, ServerOpts),
 	    Port = proplists:get_value(port, ServerOpts),
-	    Name = id(Address, Port),
-	    supervisor:delete_child(?MODULE, Name),
+	    stop_child(AccSup, Address, Port),
 	    supervisor:start_child(AccSup, Spec);
 	Reply ->
 	    Reply
     end.
 
-stop_child(Address, Port) ->
+stop_child(AccSup, Address, Port) ->
     Name = id(Address, Port),
-    case supervisor:terminate_child(?MODULE, Name) of
+    case supervisor:terminate_child(AccSup, Name) of
         ok ->
-            supervisor:delete_child(?MODULE, Name);
+            supervisor:delete_child(AccSup, Name);
         Error ->
             Error
     end.
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index 848133f838..660fe8bb65 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2013. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2014. 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
@@ -173,8 +173,8 @@ ssh_acceptor_sup([_ | Rest]) ->
     ssh_acceptor_sup(Rest).
 
 stop_acceptor(Sup) ->
-    [Name] =
-	[SupName || {SupName, _, _, [ssh_acceptor_sup]} <- 
+    [{Name, AcceptorSup}] =
+	[{SupName, ASup} || {SupName, ASup, _, [ssh_acceptor_sup]} <- 
 			  supervisor:which_children(Sup)],
-    supervisor:terminate_child(Sup, Name).
+    supervisor:terminate_child(AcceptorSup, Name).