aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2018-10-29 09:36:06 +0100
committerGitHub <[email protected]>2018-10-29 09:36:06 +0100
commitc87f09ffbdd1e2d47c5108cd04c6662f7a45cbda (patch)
tree8c0f561f405709ced7c81dec83ce7f414e196129
parent949c0c810ae575e9e35998c72189b1d90e3ea075 (diff)
parentacf610d99e209b1304f9368d70fe66e46fa3cdc2 (diff)
downloadotp-c87f09ffbdd1e2d47c5108cd04c6662f7a45cbda.tar.gz
otp-c87f09ffbdd1e2d47c5108cd04c6662f7a45cbda.tar.bz2
otp-c87f09ffbdd1e2d47c5108cd04c6662f7a45cbda.zip
Merge pull request #1983 from binaryseed/bug-default-address_please/OTP-15388
Fix the default implementation of address_please
-rw-r--r--lib/kernel/src/inet_tcp_dist.erl2
-rw-r--r--lib/ssl/src/inet_tls_dist.erl2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/kernel/src/inet_tcp_dist.erl b/lib/kernel/src/inet_tcp_dist.erl
index d1701afdaa..c37212b0f9 100644
--- a/lib/kernel/src/inet_tcp_dist.erl
+++ b/lib/kernel/src/inet_tcp_dist.erl
@@ -450,7 +450,7 @@ get_tcp_address(Driver, Socket) ->
get_address_resolver(EpmdModule) ->
case erlang:function_exported(EpmdModule, address_please, 3) of
true -> {EpmdModule, address_please};
- _ -> {inet, getaddr}
+ _ -> {erl_epmd, address_please}
end.
%% ------------------------------------------------------------
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl
index ca059603ae..a4f8bb7562 100644
--- a/lib/ssl/src/inet_tls_dist.erl
+++ b/lib/ssl/src/inet_tls_dist.erl
@@ -567,7 +567,7 @@ gen_close(Driver, Socket) ->
get_address_resolver(EpmdModule, Driver) ->
case erlang:function_exported(EpmdModule, address_please, 3) of
true -> {EpmdModule, address_please};
- _ -> {Driver, getaddr}
+ _ -> {erl_epmd, address_please}
end.
%% ------------------------------------------------------------