aboutsummaryrefslogtreecommitdiffstats
path: root/lib/ssl/src
diff options
context:
space:
mode:
authorBjörn-Egil Dahlberg <[email protected]>2016-07-26 10:28:59 +0200
committerBjörn-Egil Dahlberg <[email protected]>2016-07-26 10:28:59 +0200
commit915628f0545a86033a7e07f9937d0e3d92c16907 (patch)
treec8913649db24ea7aed9d7525d91631a903d563a9 /lib/ssl/src
parent825145898d7bf69147c1e6a6ad66c3454e7ec8f1 (diff)
parent84549af1c996657aedee1263afec28b21bfa42a4 (diff)
downloadotp-915628f0545a86033a7e07f9937d0e3d92c16907.tar.gz
otp-915628f0545a86033a7e07f9937d0e3d92c16907.tar.bz2
otp-915628f0545a86033a7e07f9937d0e3d92c16907.zip
Merge branch 'lemenkov/kernel/fix-register_ipv6_epmd/PR-1129/OTP-13770' into maint
* lemenkov/kernel/fix-register_ipv6_epmd/PR-1129/OTP-13770: Respect -proto_dist switch while connection to EPMD
Diffstat (limited to 'lib/ssl/src')
-rw-r--r--lib/ssl/src/ssl_tls_dist_proxy.erl2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
index a920f54ed2..08947f24dd 100644
--- a/lib/ssl/src/ssl_tls_dist_proxy.erl
+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl
@@ -117,7 +117,7 @@ handle_call({listen, Driver, Name}, _From, State) ->
{ok, WorldTcpAddress} = get_tcp_address(World),
{_,Port} = WorldTcpAddress#net_address.address,
ErlEpmd = net_kernel:epmd_module(),
- case ErlEpmd:register_node(Name, Port) of
+ case ErlEpmd:register_node(Name, Port, Driver) of
{ok, Creation} ->
{reply, {ok, {Socket, TcpAddress, Creation}},
State#state{listen={Socket, World}}};