diff options
| author | Lukas Larsson <[email protected]> | 2018-10-29 09:36:30 +0100 |
|---|---|---|
| committer | Lukas Larsson <[email protected]> | 2018-10-29 09:36:30 +0100 |
| commit | 6b4de1a87af4910fc4b9a3c5dc4a386985a65f49 (patch) | |
| tree | 51f3bc0eff5e19efd1b3c2600199d37caa9ad3bb | |
| parent | 78af1f300bb121e22e735b2d741cdc8f7d65102a (diff) | |
| parent | c87f09ffbdd1e2d47c5108cd04c6662f7a45cbda (diff) | |
| download | otp-6b4de1a87af4910fc4b9a3c5dc4a386985a65f49.tar.gz otp-6b4de1a87af4910fc4b9a3c5dc4a386985a65f49.tar.bz2 otp-6b4de1a87af4910fc4b9a3c5dc4a386985a65f49.zip | |
Merge branch 'maint'
| -rw-r--r-- | lib/kernel/src/inet_tcp_dist.erl | 2 | ||||
| -rw-r--r-- | lib/ssl/src/inet_tls_dist.erl | 2 |
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 7f1a77f601..ce771343fe 100644 --- a/lib/ssl/src/inet_tls_dist.erl +++ b/lib/ssl/src/inet_tls_dist.erl @@ -568,7 +568,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. %% ------------------------------------------------------------ |