aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_system_sup.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2016-06-01 16:09:35 +0200
committerHans Nilsson <[email protected]>2016-06-01 18:59:22 +0200
commit3b769cfe66b81467d756fe670fe25e2fd984fdba (patch)
tree989aff103a1fd3ae2c4e499b9dbd7ab5548fa6fa /lib/ssh/src/ssh_system_sup.erl
parentd7d109ca8ab68d7a62772305d543123233d4eea4 (diff)
downloadotp-3b769cfe66b81467d756fe670fe25e2fd984fdba.tar.gz
otp-3b769cfe66b81467d756fe670fe25e2fd984fdba.tar.bz2
otp-3b769cfe66b81467d756fe670fe25e2fd984fdba.zip
ssh: daemon taking open socket as input
Diffstat (limited to 'lib/ssh/src/ssh_system_sup.erl')
-rw-r--r--lib/ssh/src/ssh_system_sup.erl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_system_sup.erl b/lib/ssh/src/ssh_system_sup.erl
index 5035bc8f80..e97ac7b01a 100644
--- a/lib/ssh/src/ssh_system_sup.erl
+++ b/lib/ssh/src/ssh_system_sup.erl
@@ -131,7 +131,10 @@ init([ServerOpts]) ->
RestartStrategy = one_for_one,
MaxR = 0,
MaxT = 3600,
- Children = child_specs(ServerOpts),
+ Children = case proplists:get_value(asocket,ServerOpts) of
+ undefined -> child_specs(ServerOpts);
+ _ -> []
+ end,
{ok, {{RestartStrategy, MaxR, MaxT}, Children}}.
%%%=========================================================================