ssh: Patch 1119

    OTP-8550  The function ssh:connect/4 was not exported.

    OTP-8644  Aligned error message with used version (SSH_FX_FAILURE
              vs SSH_FX_NOT_A_DIRECTORY, the latter introduced in version
              6).

    OTP-8645  Resolved race condition when another connection is started
              before a channel is opened in the first connection.

    OTP-8535  The configuration parameter ip_v6_disabled is now available,
              which makes it possible for the user to alter the IP version
              SSH shall use.

    OTP-8534  The ssh_connection:send operation now accepts infinity as
              timeout.

    OTP-8524  The connection handler now include stack traces when a channel
              message is not handled correctly.

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl
index d19fee14e1..9060626ab3 100644
--- a/lib/ssh/src/ssh_acceptor.erl
+++ b/lib/ssh/src/ssh_acceptor.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2008-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2008-2010. 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
 %% compliance with the License. You should have received a copy of the
 %% Erlang Public License along with this software. If not, it can be
 %% retrieved online at http://www.erlang.org/.
-%% 
+%%
 %% Software distributed under the License is distributed on an "AS IS"
 %% basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See
 %% the License for the specific language governing rights and limitations
 %% under the License.
-%% 
+%%
 %% %CopyrightEnd%
 %%
 
@@ -79,11 +79,11 @@ acceptor_loop(Callback, Port, Address, Opts, ListenSocket, AcceptTimeout) ->
 
 handle_connection(Callback, Address, Port, Options, Socket) ->
     SystemSup = ssh_system_sup:system_supervisor(Address, Port),
-    ssh_system_sup:start_subsystem(SystemSup, Options),
+    {ok, SubSysSup} = ssh_system_sup:start_subsystem(SystemSup, Options),
     ConnectionSup = ssh_system_sup:connection_supervisor(SystemSup),
     {ok, Pid} = 
 	ssh_connection_controler:start_manager_child(ConnectionSup,
-					       [server, Socket, Options]),
+					       [server, Socket, Options, SubSysSup]),
     Callback:controlling_process(Socket, Pid),
     SshOpts = proplists:get_value(ssh_opts, Options),
     Pid ! {start_connection, server, [Address, Port, Socket, SshOpts]}.