From e4653d52abd98628fb862a8b01ea804473bdb338 Mon Sep 17 00:00:00 2001
From: Ingela Anderton Andin <ingela@erlang.org>
Date: Fri, 22 Nov 2013 14:54:43 +0100
Subject: ssh: Correct close handling

Commit 68263a48bfbdac4dc219a91f06af3d535d881850 got close handling
slightly wrong, channels did not get their close message.

Commit 32102f1e8225dada7526c9bfee6622f9026ba4cd did not work as expected
---
 lib/ssh/src/sshd_sup.erl | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'lib/ssh/src/sshd_sup.erl')

diff --git a/lib/ssh/src/sshd_sup.erl b/lib/ssh/src/sshd_sup.erl
index 747906b2cf..60222f5172 100644
--- a/lib/ssh/src/sshd_sup.erl
+++ b/lib/ssh/src/sshd_sup.erl
@@ -1,7 +1,7 @@
 %%
 %% %CopyrightBegin%
 %%
-%% Copyright Ericsson AB 2008-2010. All Rights Reserved.
+%% Copyright Ericsson AB 2008-2013. 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
@@ -58,12 +58,7 @@ start_child(ServerOpts) ->
     end.
 
 stop_child(Name) ->
-    case supervisor:terminate_child(?MODULE, Name) of
-        ok ->
-            supervisor:delete_child(?MODULE, Name);
-        Error ->
-            Error
-    end.
+    supervisor:terminate_child(?MODULE, Name).
 
 stop_child(Address, Port) ->
     Name = id(Address, Port),
@@ -94,7 +89,7 @@ init([Servers]) ->
 child_spec(Address, Port, ServerOpts) ->
     Name = id(Address, Port),
     StartFunc = {ssh_system_sup, start_link, [ServerOpts]},
-    Restart = transient, 
+    Restart = temporary, 
     Shutdown = infinity,
     Modules = [ssh_system_sup],
     Type = supervisor,
-- 
cgit v1.2.3