aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorErlang/OTP <[email protected]>2017-03-31 12:58:33 +0200
committerErlang/OTP <[email protected]>2017-03-31 12:58:33 +0200
commitd4a21ffc3300a779880eacebd857d6f03275ec90 (patch)
tree8a607dd4cf4bcc7adeef84a4c4b9e891a3c85e75 /lib
parent1a8d79217b31225159de25c5d10d60a0aa928be2 (diff)
parent7f5d5119d59e1741aac6b622880dbc2f08b394de (diff)
downloadotp-d4a21ffc3300a779880eacebd857d6f03275ec90.tar.gz
otp-d4a21ffc3300a779880eacebd857d6f03275ec90.tar.bz2
otp-d4a21ffc3300a779880eacebd857d6f03275ec90.zip
Merge branch 'hans/ssh/daemon_info_crash_ip/OTP-14298' into maint-19
* hans/ssh/daemon_info_crash_ip/OTP-14298: ssh: fixed crash in ssh:daemon_info
Diffstat (limited to 'lib')
-rw-r--r--lib/ssh/src/ssh.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssh/src/ssh.erl b/lib/ssh/src/ssh.erl
index 1f3f77a4e4..290525cec0 100644
--- a/lib/ssh/src/ssh.erl
+++ b/lib/ssh/src/ssh.erl
@@ -175,7 +175,7 @@ daemon_info(Pid) ->
case catch ssh_system_sup:acceptor_supervisor(Pid) of
AsupPid when is_pid(AsupPid) ->
[Port] =
- [Prt || {{ssh_acceptor_sup,any,Prt,default},
+ [Prt || {{ssh_acceptor_sup,_,Prt,_},
_WorkerPid,worker,[ssh_acceptor]} <- supervisor:which_children(AsupPid)],
{ok, [{port,Port}]};