From 4e315422de9bb1b5c8d6668cbccf8fe1084f536c Mon Sep 17 00:00:00 2001
From: Niclas Eklund <nick@erlang.org>
Date: Wed, 14 Apr 2010 15:02:06 +0000
Subject: Removed call to the deprecated module ssh_cm

---
 lib/ssh/src/ssh.appup.src |  4 ++++
 lib/ssh/src/ssh_cli.erl   | 12 ++++++------
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'lib/ssh')

diff --git a/lib/ssh/src/ssh.appup.src b/lib/ssh/src/ssh.appup.src
index b082d66988..8f4b46051d 100644
--- a/lib/ssh/src/ssh.appup.src
+++ b/lib/ssh/src/ssh.appup.src
@@ -21,10 +21,12 @@
  [
   {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []},
              {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_cli, soft_purge, soft_purge, []},
              {load_module, ssh_connection, soft_purge, soft_purge, []}]},
   {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
              {load_module, ssh_connection, soft_purge, soft_purge, []},
              {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_cli, soft_purge, soft_purge, []},
              {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
   {"1.1.6", [{restart_application, ssh}]},
   {"1.1.5", [{restart_application, ssh}]},
@@ -35,10 +37,12 @@
  [
   {"1.1.8", [{load_module, ssh_connection_manager, soft_purge, soft_purge, []},
              {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_cli, soft_purge, soft_purge, []},
              {load_module, ssh_connection, soft_purge, soft_purge, []}]},
   {"1.1.7", [{load_module, ssh_connection_handler, soft_purge, soft_purge, []},
              {load_module, ssh_connection, soft_purge, soft_purge, []},
              {load_module, ssh, soft_purge, soft_purge, []},
+             {load_module, ssh_cli, soft_purge, soft_purge, []},
              {load_module, ssh_connection_manager, soft_purge, soft_purge, []}]},
   {"1.1.6", [{restart_application, ssh}]},
   {"1.1.5", [{restart_application, ssh}]},
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
-- 
cgit v1.2.3