aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssh/src/ssh_acceptor.erl
diff options
context:
space:
mode:
authorHans Nilsson <[email protected]>2015-11-24 12:18:47 +0100
committerHans Nilsson <[email protected]>2015-11-24 12:18:47 +0100
commit3747f01d19676f6f8d5d8b0a05c9ddbf6d92be49 (patch)
tree3e68106ae3554e0bdd3d770d0cfd7bf39f56996b /lib/ssh/src/ssh_acceptor.erl
parentd56fda8a730ff43bdfc15936519effb61fbd03e3 (diff)
parente6d99a21e905f234d579bd2e64a275fc4fdd5ed9 (diff)
downloadotp-3747f01d19676f6f8d5d8b0a05c9ddbf6d92be49.tar.gz
otp-3747f01d19676f6f8d5d8b0a05c9ddbf6d92be49.tar.bz2
otp-3747f01d19676f6f8d5d8b0a05c9ddbf6d92be49.zip
Merge branch 'hans/ssh/fd_more/OTP-12966' into maint
* hans/ssh/fd_more/OTP-12966: ssh: testcases for starting daemon with given fd ssh: Make it possible for more than one daemon started with option fd
Diffstat (limited to 'lib/ssh/src/ssh_acceptor.erl')
-rw-r--r--lib/ssh/src/ssh_acceptor.erl7
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh_acceptor.erl b/lib/ssh/src/ssh_acceptor.erl
index c5ad1d7b6c..d94dedf1bf 100644
--- a/lib/ssh/src/ssh_acceptor.erl
+++ b/lib/ssh/src/ssh_acceptor.erl
@@ -56,7 +56,12 @@ acceptor_init(Parent, Port, Address, SockOpts, Opts, AcceptTimeout) ->
error
end.
-do_socket_listen(Callback, Port, Opts) ->
+do_socket_listen(Callback, Port0, Opts) ->
+ Port =
+ case proplists:get_value(fd, Opts) of
+ undefined -> Port0;
+ _ -> 0
+ end,
case Callback:listen(Port, Opts) of
{error, nxdomain} ->
Callback:listen(Port, lists:delete(inet6, Opts));