diff options
author | Ingela Anderton Andin <[email protected]> | 2017-10-23 11:05:11 +0200 |
---|---|---|
committer | Ingela Anderton Andin <[email protected]> | 2017-10-23 11:05:11 +0200 |
commit | 016c090de0ac94de4c359536d3232555379755ba (patch) | |
tree | 073d0b1fa576f64ad2f8387d5200d30690e1754d | |
parent | a74ec829af3c78213ac2532d996fed32f628e300 (diff) | |
parent | b425be16b3678496858254e957eb35380d628227 (diff) | |
download | otp-016c090de0ac94de4c359536d3232555379755ba.tar.gz otp-016c090de0ac94de4c359536d3232555379755ba.tar.bz2 otp-016c090de0ac94de4c359536d3232555379755ba.zip |
Merge branch 'ingela/ssl/dist-crl' into maint
* ingela/ssl/dist-crl:
ssl: Do not provide IP address to ssl:connect in erlang distribution over TLS
-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 0da4b3587f..78094c474b 100644 --- a/lib/ssl/src/inet_tls_dist.erl +++ b/lib/ssl/src/inet_tls_dist.erl @@ -93,7 +93,7 @@ do_setup(Driver, Kernel, Node, Type, MyNode, LongOrShortNames, SetupTime) -> ?trace("port_please(~p) -> version ~p~n", [Node,Version]), dist_util:reset_timer(Timer), - case ssl_tls_dist_proxy:connect(Driver, Ip, TcpPort) of + case ssl_tls_dist_proxy:connect(Driver, Address, TcpPort) of {ok, Socket} -> HSData = connect_hs_data(Kernel, Node, MyNode, Socket, Timer, Version, Ip, TcpPort, Address, |