diff options
author | Raimo Niskanen <[email protected]> | 2017-11-29 10:28:31 +0100 |
---|---|---|
committer | Raimo Niskanen <[email protected]> | 2017-12-04 13:56:29 +0100 |
commit | 6f68901d8df9538d44574040f1faef12346df92b (patch) | |
tree | 463a2fba2571ab0a5596611564bffd31cd018382 | |
parent | e74ae61325c4bc6f3a4503b2e628361784214274 (diff) | |
download | otp-6f68901d8df9538d44574040f1faef12346df92b.tar.gz otp-6f68901d8df9538d44574040f1faef12346df92b.tar.bz2 otp-6f68901d8df9538d44574040f1faef12346df92b.zip |
Use -ssl_dist_optfile options
-rw-r--r-- | lib/ssl/src/inet_tls_dist.erl | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/lib/ssl/src/inet_tls_dist.erl b/lib/ssl/src/inet_tls_dist.erl index 96782dcfc0..d9468aba1e 100644 --- a/lib/ssl/src/inet_tls_dist.erl +++ b/lib/ssl/src/inet_tls_dist.erl @@ -524,6 +524,17 @@ nodelay() -> get_ssl_options(Type) -> + try ets:lookup(ssl_dist_opts, Type) of + [{Type, Opts}] -> + [{erl_dist, true} | Opts]; + _ -> + get_ssl_dist_arguments(Type) + catch + error:badarg -> + get_ssl_dist_arguments(Type) + end. + +get_ssl_dist_arguments(Type) -> case init:get_argument(ssl_dist_opt) of {ok, Args} -> [{erl_dist, true} | ssl_options(Type, lists:append(Args))]; |