File 2382-ssh-Option-pruning.patch of Package erlang

Overview Repositories Revisions Requests Users Attributes Meta

File 2382-ssh-Option-pruning.patch of Package erlang

From 7925b59450dd6f34b756da7b10dd10af95304d94 Mon Sep 17 00:00:00 2001
From: Hans Nilsson <hans@erlang.org>
Date: Tue, 28 Feb 2017 12:19:37 +0100
Subject: [PATCH 02/13] ssh: Option pruning

---
 lib/ssh/src/ssh.erl            | 3 +--
 lib/ssh/src/ssh_acceptor.erl   | 1 -
 lib/ssh/src/ssh_system_sup.erl | 2 +-
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 369a00ac4..c1be9f732 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -368,8 +368,7 @@ do_start_daemon(Socket, Options) ->
 	    _:_ -> throw(bad_socket)
 	end,
     Host = fmt_host(IP),
-    Opts = ?PUT_INTERNAL_OPT([{asocket, Socket},
-                              {asock_owner,self()},
+    Opts = ?PUT_INTERNAL_OPT([{connected_socket, Socket},
                               {address, Host},
                               {port, Port},
                               {role, server}], Options),
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl
index 42be18f2a..4943f062b 100644
--- a/lib/ssh/src/ssh_acceptor.erl
+++ b/lib/ssh/src/ssh_acceptor.erl
@@ -66,7 +66,6 @@ acceptor_init(Parent, Port, Address, Opts, AcceptTimeout) ->
             of
                 {ok, ListenSocket} ->
                     proc_lib:init_ack(Parent, {ok, self()}),
-                    {_, Callback, _} = ?GET_OPT(transport, Opts),
                     acceptor_loop(Callback, 
                                   Port, Address, Opts, ListenSocket, AcceptTimeout);
                 {error,Error} ->
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index b0bbd3aae..5a58ef1c4 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -131,7 +131,7 @@ init([Options]) ->
     RestartStrategy = one_for_one,
     MaxR = 0,
     MaxT = 3600,
-    Children = case ?GET_INTERNAL_OPT(asocket,Options,undefined) of
+    Children = case ?GET_INTERNAL_OPT(connected_socket,Options,undefined) of
 		   undefined -> child_specs(Options);
 		   _ -> []
 	       end,
-- 
2.12.2

Places

File 2382-ssh-Option-pruning.patch of Package erlang

Places