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.

13 files changed, 181 insertions, 117 deletions

diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 9597137cdf..1e4870c8fb 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -29,6 +29,53 @@
     <file>notes.xml</file>
   </header>
 
+ <section><title>Ssh 1.1.9</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>The function ssh:connect/4 was not exported.</p>
+          <p>Own Id: OTP-8550 Aux Id:</p>
+        </item>
+        <item>
+          <p>Aligned error message with used version (SSH_FX_FAILURE vs 
+             SSH_FX_NOT_A_DIRECTORY, the latter introduced in version 6).</p>
+          <p>
+            *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>Own Id: OTP-8644 Aux Id: seq11574</p>
+        </item>
+        <item>
+          <p>Resolved race condition when another connection is started
+             before a channel is opened in the first connection.</p>
+          <p>Own Id: OTP-8645 Aux Id: seq11577</p>
+        </item>
+      </list>
+    </section>
+
+    <section><title>Improvements and New Features</title>
+      <list>
+        <item>
+          <p>The configuration parameter ip_v6_disabled is now available,
+             which makes it possible for the user to alter the IP version
+             SSH shall use.</p>
+          <p>
+            *** POTENTIAL INCOMPATIBILITY ***</p>
+          <p>Own Id: OTP-8535 Aux Id:</p>
+        </item>
+        <item>
+          <p>The ssh_connection:send operation now accepts infinity as timeout.</p>
+          <p>Own Id: OTP-8534 Aux Id:</p>
+        </item>
+        <item>
+          <p>The connection handler now include stack traces when a channel 
+             message is not handled correctly.</p>
+          <p>Own Id: OTP-8524 Aux Id:</p>
+        </item>
+      </list>
+    </section>
+
+ </section>
+
  <section><title>Ssh 1.1.8</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/doc/src/ssh.xml b/lib/ssh/doc/src/ssh.xml
index aca5c9cdc4..71e6b2cd3d 100644
--- a/lib/ssh/doc/src/ssh.xml
+++ b/lib/ssh/doc/src/ssh.xml
@@ -4,7 +4,7 @@
 <erlref>
   <header>
     <copyright>
-      <year>2004</year><year>2009</year>
+      <year>2004</year><year>2010</year>
       <holder>Ericsson AB. All Rights Reserved.</holder>
     </copyright>
     <legalnotice>
@@ -13,12 +13,12 @@
       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.
-    
+
     </legalnotice>
     
     <title>ssh</title>
@@ -159,6 +159,9 @@
 	  <item>
 	    <p>Allow an existing file-descriptor to be used
 	  (simply passed on to the transport protocol).</p></item>
+	  <tag><c><![CDATA[{ip_v6_disabled, boolean()}]]></c></tag>
+	  <item>
+	    <p>Determines if SSH shall use IPv6 or not.</p></item>
 	</taglist>
       </desc>   
     </func>
@@ -198,8 +201,8 @@
 	  <item>
 	    Provides specifications for handling of subsystems.  The
 	    "sftp" subsystem-spec can be retrieved by calling
-	    ssh_sftd:subsystem_spec/1. If the subsystems option in not present
-	    the value of <c>[ssh_sftd:subsystem_spec([])]</c> will be used.
+	    ssh_sftpd:subsystem_spec/1. If the subsystems option in not present
+	    the value of <c>[ssh_sftpd:subsystem_spec([])]</c> will be used.
 	    It is of course possible to set the option to the empty list
 	    if you do not want the daemon to run any subsystems at all.
 	  </item>
@@ -252,6 +255,10 @@
 	  <item>
 	    <p>Allow an existing file-descriptor to be used
 	  (simply passed on to the transport protocol).</p></item>
+	  <tag><c><![CDATA[{ip_v6_disabled, boolean()}]]></c></tag>
+	  <item>
+	    <p>Determines if SSH shall use IPv6 or not (only used when 
+               HostAddress is set to any).</p></item>
         </taglist>
       </desc>
     </func>
diff --git a/lib/ssh/examples/ssh_sample_cli.erl b/lib/ssh/examples/ssh_sample_cli.erl
index 2505c1b759..6f3092e567 100644
--- a/lib/ssh/examples/ssh_sample_cli.erl
+++ b/lib/ssh/examples/ssh_sample_cli.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-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%
 %%
 
@@ -30,19 +30,15 @@
 %% our command functions
 -export([cli_prime/1, cli_primes/1, cli_gcd/2, cli_lcm/2,
 	 cli_factors/1, cli_exit/0, cli_rho/1, cli_help/0,
-	 cli_crash/0, cli_users/0, cli_self/0,
-	 cli_user/0, cli_host/0]).
-
-%% imports
--import(lists, [reverse/1, reverse/2, seq/2, prefix/2]).
--import(math, [sqrt/1]).
-
+	 cli_crash/0, cli_self/0, cli_user/0, cli_host/0]).
 
 listen(Port) ->
     listen(Port, []).
 
 listen(Port, Options) ->
-    ssh_cli:listen(fun(U, H) -> start_our_shell(U, H) end, Port, Options).
+    crypto:start(),
+    ssh:start(),
+    ssh:daemon(any, Port, [{shell, fun(U, H) -> start_our_shell(U, H) end} | Options]).
 
 %% our_routines
 our_routines() ->
@@ -56,7 +52,6 @@ our_routines() ->
      {"prime", cli_prime,    "<int>       check for primality"},
      {"primes", cli_primes,  "<int>       print all primes up to <int>"},
      {"rho", cli_rho,        "<int>       prime factors using rho's alg."},
-     {"who",  cli_users,     "            lists users"},
      {"user", cli_user,      "            print name of user"},
      {"host", cli_host,      "            print host addr"},
      {"self", cli_self,      "            print my pid"}
@@ -85,11 +80,11 @@ our_routines() ->
 common_prefix([C | R1], [C | R2], Acc) ->
     common_prefix(R1, R2, [C | Acc]);
 common_prefix(_, _, Acc) ->
-    reverse(Acc).
+    lists:reverse(Acc).
 
 %% longest prefix in a list, given a prefix
 longest_prefix(List, Prefix) ->
-    case [A || {A, _, _} <- List, prefix(Prefix, A)] of
+    case [A || {A, _, _} <- List, lists:prefix(Prefix, A)] of
 	[] ->
 	    {none, List};
 	[S | Rest] ->
@@ -112,7 +107,7 @@ longest_prefix(List, Prefix) ->
 expand([$  | _]) ->
     {no, "", []};
 expand(RevBefore) ->    
-    Before = reverse(RevBefore),
+    Before = lists:reverse(RevBefore),
     case longest_prefix(our_routines(), Before) of
 	{prefix, P, [_]} ->
 	    {yes, P ++ " ", []};
@@ -139,22 +134,27 @@ start_our_shell(User, Peer) ->
 %%% an ordinary Read-Eval-Print-loop
 our_shell_loop() ->
     % Read
-    Line = io:get_line({format, "CLI> ", []}),
+    Line = io:get_line("CLI> "),
     % Eval
     Result = eval_cli(Line),
     % Print
     io:format("---> ~p\n", [Result]),
     case Result of
-	done -> exit(normal);
-	crash -> 1 / 0;
-	_ -> our_shell_loop()
+	done -> 
+	    exit(normal);
+	crash -> 
+	    1 / 0;
+	_ -> 
+	    our_shell_loop()
     end.
 
 %%% translate a command to a function
 command_to_function(Command) ->
     case lists:keysearch(Command, 1, our_routines()) of
-	{value, {_, Proc, _}} -> Proc;
-	false -> unknown_cli
+	{value, {_, Proc, _}} -> 
+	    Proc;
+	false -> 
+	    unknown_cli
     end.
 
 %%% evaluate a command line
@@ -209,14 +209,6 @@ cli_user() ->
 cli_host() ->
     get(peer_name).
 
-cli_users() ->
-    case ssh_userauth:get_auth_users() of
-	{ok, UsersPids} ->
-	    UsersPids; % [U || {U, _} <- UsersPids];
-	E ->
-	    E
-    end.
-
 cli_self() ->
     self().
 
@@ -243,7 +235,7 @@ cli_help() ->
 
 %% a quite simple Sieve of Erastothenes (not tail-recursive, though)
 primes(Size) ->
-    era(sqrt(Size), seq(2,Size)).
+    era(math:sqrt(Size), lists:seq(2,Size)).
 
 era(Max, [H|T]) when H =< Max ->
     [H | era(Max, sieve([H|T], H))];
@@ -267,7 +259,7 @@ next_prime(Primes, P) ->
 
 next_prime1(Primes, P) ->
     P1 = P + 2,
-    case divides(Primes, trunc(sqrt(P1)), P1) of
+    case divides(Primes, trunc(math:sqrt(P1)), P1) of
 	false -> P1;
 	true -> next_prime1(Primes, P1)
     end.
@@ -282,7 +274,7 @@ divides([_ | R], Nsqrt, N) ->
     divides(R, Nsqrt, N).
 
 is_prime(P) ->
-    lists:all(fun(A) -> P rem A =/= 0 end, primes(trunc(sqrt(P)))).
+    lists:all(fun(A) -> P rem A =/= 0 end, primes(trunc(math:sqrt(P)))).
 
 %% Normal gcd, Euclid
 gcd(R, Q) when abs(Q) < abs(R) -> gcd1(Q,R);
@@ -300,17 +292,17 @@ lcm(R, Q) ->
 
 %%% Prime factors of a number (na�ve implementation)
 factors(N) ->
-    Nsqrt = trunc(sqrt(N)),
+    Nsqrt = trunc(math:sqrt(N)),
     factors([], N, 2, Nsqrt, []).
     
 factors(_Primes, N, Prime, Nsqrt, Factors) when Prime > Nsqrt ->
-    reverse(Factors, [N]);
+    lists:reverse(Factors, [N]);
 factors(Primes, N, Prime, Nsqrt, Factors) ->
     case N rem Prime of
 	0 ->
 	    %%io:format("factor ------- ~p\n", [Prime]),
 	    N1 = N div Prime,
-	    factors(Primes, N1, Prime, trunc(sqrt(N1)), [Prime|Factors]);
+	    factors(Primes, N1, Prime, trunc(math:sqrt(N1)), [Prime|Factors]);
 	_ ->
 	    Primes1 = Primes ++ [Prime],
 	    Prime1 = next_prime(Primes1, Prime),
diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index 5329373862..dac8f55eaa 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -19,7 +19,8 @@
 
 {"%VSN%",	
  [
-  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
+  {"1.1.8", [{restart_application, ssh}]},
+  {"1.1.7", [{restart_application, ssh}]},
   {"1.1.6", [{restart_application, ssh}]},
   {"1.1.5", [{restart_application, ssh}]},
   {"1.1.4", [{restart_application, ssh}]},
@@ -27,7 +28,8 @@
   {"1.1.2", [{restart_application, ssh}]}
  ],
  [
-  {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []}]},
+  {"1.1.8", [{restart_application, ssh}]},
+  {"1.1.7", [{restart_application, ssh}]},
   {"1.1.6", [{restart_application, ssh}]},
   {"1.1.5", [{restart_application, ssh}]},
   {"1.1.4", [{restart_application, ssh}]},
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index f9a986a8b6..994c77436a 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2004-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2004-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%
 %%
 
@@ -24,7 +24,7 @@
 -include("ssh.hrl").
 -include("ssh_connect.hrl").
 
--export([start/0, start/1, stop/0, connect/3, close/1, connection_info/2,
+-export([start/0, start/1, stop/0, connect/3, connect/4, close/1, connection_info/2,
 	 channel_info/3,
 	 daemon/1, daemon/2, daemon/3,
 	 stop_listener/1, stop_listener/2, stop_daemon/1, stop_daemon/2,
@@ -330,10 +330,10 @@ handle_options([{nodelay, _} = Opt | Rest], SockOpts, Opts) ->
 handle_options([Opt | Rest], SockOpts, Opts) ->
     handle_options(Rest, SockOpts, [Opt | Opts]).
 
+%% Has IPv6 been disabled?
 inetopt(true) ->
-    inet6;
-
+    inet;
 inetopt(false) ->
-    inet.
+    inet6.
 
 
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]}.
diff --git a/lib/ssh/src/ssh_cli.erl b/lib/ssh/src/ssh_cli.erl
index 964f35121a..2764ea2e43 100644
--- a/lib/ssh/src/ssh_cli.erl
+++ b/lib/ssh/src/ssh_cli.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-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%
 %%
 
@@ -428,7 +428,7 @@ start_shell(ConnectionManager, State) ->
 			       {ok, User} = 
 				   ssh_userreg:lookup_user(ConnectionManager),
 			       {ok, PeerAddr} = 
-				   ssh_cm:get_peer_addr(ConnectionManager),
+				   ssh_connection_manager:peer_addr(ConnectionManager),
 			       fun() -> Shell(User, PeerAddr) end;
 			   _ ->
 			       Shell
diff --git a/lib/ssh/src/ssh_connect.hrl b/lib/ssh/src/ssh_connect.hrl
index a5a4e42cd8..34d4ff8fc1 100755
--- a/lib/ssh/src/ssh_connect.hrl
+++ b/lib/ssh/src/ssh_connect.hrl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-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%
 %%
 
@@ -260,5 +260,6 @@
 	  address, 
 	  port,
 	  options,
-	  exec
+	  exec,
+	  sub_system_supervisor
 	 }).
diff --git a/lib/ssh/src/ssh_connection.erl b/lib/ssh/src/ssh_connection.erl
index 0aaf1c18d2..7b9e9185bf 100644
--- a/lib/ssh/src/ssh_connection.erl
+++ b/lib/ssh/src/ssh_connection.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%
 %%
 
@@ -123,6 +123,8 @@ send(ConnectionManager, ChannelId, Data) ->
     send(ConnectionManager, ChannelId, 0, Data, infinity).
 send(ConnectionManager, ChannelId, Data, TimeOut) when is_integer(TimeOut) ->
     send(ConnectionManager, ChannelId, 0, Data, TimeOut);
+send(ConnectionManager, ChannelId, Data, infinity) ->
+    send(ConnectionManager, ChannelId, 0, Data, infinity);
 send(ConnectionManager, ChannelId, Type, Data) ->
     send(ConnectionManager, ChannelId, Type, Data, infinity).
 send(ConnectionManager, ChannelId, Type, Data, TimeOut) ->
@@ -944,13 +946,12 @@ encode_ip(Addr) when is_list(Addr) ->
 	    end
     end.
 
-start_channel(Address, Port, Cb, Id, Args) ->
-    start_channel(Address, Port, Cb, Id, Args, undefined).
+start_channel(Cb, Id, Args, SubSysSup) ->
+    start_channel(Cb, Id, Args, SubSysSup, undefined).
 
-start_channel(Address, Port, Cb, Id, Args, Exec) ->
+start_channel(Cb, Id, Args, SubSysSup, Exec) ->
     ChildSpec = child_spec(Cb, Id, Args, Exec),
-    SystemSup = ssh_system_sup:system_supervisor(Address, Port),
-    ChannelSup = ssh_system_sup:channel_supervisor(SystemSup),
+    ChannelSup =ssh_subsystem_sup:channel_supervisor(SubSysSup),
     ssh_channel_sup:start_child(ChannelSup, ChildSpec).
     
 %%--------------------------------------------------------------------
@@ -1015,18 +1016,19 @@ start_cli(#connection{address = Address, port = Port, cli_spec = {Fun, [Shell]},
 	    {ok, Pid}
     end;
 
-start_cli(#connection{address = Address, port = Port,
-		      cli_spec = {CbModule, Args}, exec = Exec}, ChannelId) ->
-    start_channel(Address, Port, CbModule, ChannelId, Args, Exec).
+start_cli(#connection{cli_spec = {CbModule, Args}, exec = Exec,
+		      sub_system_supervisor = SubSysSup}, ChannelId) ->
+    start_channel(CbModule, ChannelId, Args, SubSysSup, Exec).
 
 start_subsytem(BinName, #connection{address = Address, port = Port, 
-				    options = Options},
+				    options = Options, 
+				    sub_system_supervisor = SubSysSup},
 	       #channel{local_id = ChannelId, remote_id = RemoteChannelId},
 	       ReplyMsg) ->
     Name = binary_to_list(BinName),
     case check_subsystem(Name, Options) of
 	{Callback, Opts} when is_atom(Callback), Callback =/= none ->
-	    start_channel(Address, Port, Callback, ChannelId, Opts);
+	    start_channel(Callback, ChannelId, Opts, SubSysSup);
 	{Other, _} when Other =/= none ->
 	    handle_backwards_compatibility(Other, self(), 
 					   ChannelId, RemoteChannelId,
diff --git a/lib/ssh/src/ssh_connection_controler.erl b/lib/ssh/src/ssh_connection_controler.erl
index 7960eb11c6..636ecba532 100644
--- a/lib/ssh/src/ssh_connection_controler.erl
+++ b/lib/ssh/src/ssh_connection_controler.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2009-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%
 %%
 %%--------------------------------------------------------------------
@@ -99,8 +99,8 @@ terminate(_Reason, #state{}) ->
 handle_call({handler, Pid, [Role, Socket, Opts]}, _From, State) ->
     {ok, Handler} = ssh_connection_handler:start_link(Role, Pid, Socket, Opts),
     {reply, {ok, Handler}, State#state{handler = Handler}};
-handle_call({manager, [server = Role, Socket, Opts]}, _From, State) ->
-    {ok, Manager} = ssh_connection_manager:start_link([Role, Socket, Opts]),
+handle_call({manager, [server = Role, Socket, Opts, SubSysSup]}, _From, State) ->
+    {ok, Manager} = ssh_connection_manager:start_link([Role, Socket, Opts, SubSysSup]),
     {reply, {ok, Manager}, State#state{manager = Manager}};
 handle_call({manager, [client = Role | Opts]}, _From, State) ->
     {ok, Manager} = ssh_connection_manager:start_link([Role, Opts]),
diff --git a/lib/ssh/src/ssh_connection_manager.erl b/lib/ssh/src/ssh_connection_manager.erl
index 3863005e74..cffeade485 100644
--- a/lib/ssh/src/ssh_connection_manager.erl
+++ b/lib/ssh/src/ssh_connection_manager.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%
 %%
 %%
@@ -178,7 +178,7 @@ send_eof(ConnectionManager, ChannelId) ->
 %%                         {stop, Reason}
 %% Description: Initiates the server
 %%--------------------------------------------------------------------
-init([server, _Socket, Opts]) ->  
+init([server, _Socket, Opts, SubSysSup]) ->  
     process_flag(trap_exit, true),
     ssh_bits:install_messages(ssh_connection:messages()),
     Cache = ssh_channel:cache_create(), 
@@ -187,7 +187,8 @@ init([server, _Socket, Opts]) ->
 					       channel_id_seed = 0,
 					       port_bindings = [],
 					       requests = [],
-					       channel_pids = []},
+					       channel_pids = [],
+					       sub_system_supervisor = SubSysSup},
 		opts = Opts,
 		connected = false}};
 
@@ -272,18 +273,18 @@ handle_call({ssh_msg, Pid, Msg}, From,
 	    {stop, normal, State#state{connection_state = Connection}}
 	catch
 	exit:{noproc, Reason} ->
-	    Report = io_lib:format("Connection probably terminated:~n~p~n~p~n",
-				   [ConnectionMsg, Reason]),
+	    Report = io_lib:format("Connection probably terminated:~n~p~n~p~n~p~n",
+				   [ConnectionMsg, Reason, erlang:get_stacktrace()]),
 	    error_logger:info_report(Report),
             {noreply, State};
 	error:Error ->
-	    Report = io_lib:format("Connection message returned:~n~p~n~p~n",
-				   [ConnectionMsg, Error]),
+	    Report = io_lib:format("Connection message returned:~n~p~n~p~n~p~n",
+				   [ConnectionMsg, Error, erlang:get_stacktrace()]),
 	    error_logger:info_report(Report),
 	    {noreply, State};
 	exit:Exit ->
-	    Report = io_lib:format("Connection message returned:~n~p~n~p~n",
-				   [ConnectionMsg, Exit]),
+	    Report = io_lib:format("Connection message returned:~n~p~n~p~n~p~n",
+				   [ConnectionMsg, Exit, erlang:get_stacktrace()]),
 	    error_logger:info_report(Report),
 	    {noreply, State}
     end;
@@ -400,7 +401,7 @@ handle_call({close, ChannelId}, _,
     end;
 
 handle_call(stop, _, #state{role = _client, 
-			    client = ChannelPid,
+			    client = _ChannelPid,
 			    connection = Pid} = State) ->
     DisconnectMsg = 
 	#ssh_msg_disconnect{code = ?SSH_DISCONNECT_BY_APPLICATION,
diff --git a/lib/ssh/src/ssh_sftpd.erl b/lib/ssh/src/ssh_sftpd.erl
index 10b8ede1e4..da91817fd7 100644
--- a/lib/ssh/src/ssh_sftpd.erl
+++ b/lib/ssh/src/ssh_sftpd.erl
@@ -1,19 +1,19 @@
 %%
 %% %CopyrightBegin%
-%% 
-%% Copyright Ericsson AB 2005-2009. All Rights Reserved.
-%% 
+%%
+%% Copyright Ericsson AB 2005-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%
 %%
 
@@ -242,7 +242,8 @@ handle_op(?SSH_FXP_REALPATH, ReqId,
     end;
 handle_op(?SSH_FXP_OPENDIR, ReqId,
 	 <<?UINT32(RLen), RPath:RLen/binary>>,
-	  State0 = #state{file_handler = FileMod, file_state = FS0}) ->
+	  State0 = #state{xf = #ssh_xfer{vsn = Vsn}, 
+			  file_handler = FileMod, file_state = FS0}) ->
     RelPath = binary_to_list(RPath),
     AbsPath = relate_file_name(RelPath, State0),
     
@@ -250,10 +251,14 @@ handle_op(?SSH_FXP_OPENDIR, ReqId,
     {IsDir, FS1} = FileMod:is_dir(AbsPath, FS0),
     State1 = State0#state{file_state = FS1},
     case IsDir of
-	false ->
+	false when Vsn > 5 ->
 	    ssh_xfer:xf_send_status(XF, ReqId, ?SSH_FX_NOT_A_DIRECTORY,
 				    "Not a directory"),
 	    State1;
+	false ->
+	    ssh_xfer:xf_send_status(XF, ReqId, ?SSH_FX_FAILURE,
+				    "Not a directory"),
+	    State1;
 	true ->
 	    add_handle(State1, XF, ReqId, directory, {RelPath,unread})
     end;
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index bc7bceeb24..78802c6a2d 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,9 +1,16 @@
 #-*-makefile-*-   ; force emacs to enter makefile-mode
 
-SSH_VSN = 1.1.8
+SSH_VSN = 1.1.9
 APP_VSN    = "ssh-$(SSH_VSN)"
 
-TICKETS = OTP-8356 \
+TICKETS = OTP-8524 \
+	OTP-8534 \
+	OTP-8535 \
+	OTP-8550 \
+	OTP-8644 \
+	OTP-8645
+
+TICKETS_1.1.8 = OTP-8356 \
 	OTP-8401
 
 TICKETS_1.1.7 = OTP-8121 \