diff options
| author | Lukas Larsson <[email protected]> | 2018-05-21 17:03:53 +0200 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-05-21 17:03:53 +0200 |
| commit | 5ec78bc5314f5b32ba28bae4d95f12ffa28469ca (patch) | |
| tree | 889c466e11321f6aff8dc8eae46f3d7c829bdfd5 /lib | |
| parent | 29871fb6086b535104b10703dd524781e87e0800 (diff) | |
| parent | 8d6a40fd09b3ff7d42786f21b1b252776ebbe1b0 (diff) | |
| download | otp-5ec78bc5314f5b32ba28bae4d95f12ffa28469ca.tar.gz otp-5ec78bc5314f5b32ba28bae4d95f12ffa28469ca.tar.bz2 otp-5ec78bc5314f5b32ba28bae4d95f12ffa28469ca.zip | |
Merge branch 'lukas/ssl/fix_erl_epmd_usage/OTP-15086'
* lukas/ssl/fix_erl_epmd_usage/OTP-15086:
ssl: Fix usage of erl_epmd in tls dist
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ssl/src/inet_tls_dist.erl | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl index d45f209838..a6ceff25cb 100644 --- a/lib/ssl/src/inet_tls_dist.erl +++ b/lib/ssl/src/inet_tls_dist.erl @@ -521,7 +521,7 @@ do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) -> ErlEpmd = net_kernel:epmd_module(), {ARMod, ARFun} = get_address_resolver(ErlEpmd, Driver), Timer = trace(dist_util:start_timer(SetupTime)), - case ARMod:ARFun(Address) of + case ARMod:ARFun(Name,Address,Driver:family()) of {ok, Ip, TcpPort, Version} -> do_setup_connect(Driver, Kernel, Node, Address, Ip, TcpPort, Version, Type, MyNode, Timer); {ok, Ip} -> |