aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRaimo Niskanen <[email protected]>2017-11-29 10:31:34 +0100
committerRaimo Niskanen <[email protected]>2017-12-04 14:51:25 +0100
commit34150ddee82a36d768ccebf46299d044ace9161d (patch)
tree0bde0cac6095d4acc5e46536b00600d86e41ce7f /lib
parent457409e8a460fa115565a5450e7f4eb4a558f32c (diff)
downloadotp-34150ddee82a36d768ccebf46299d044ace9161d.tar.gz
otp-34150ddee82a36d768ccebf46299d044ace9161d.tar.bz2
otp-34150ddee82a36d768ccebf46299d044ace9161d.zip
Use -ssl_dist_optfile options
Diffstat (limited to 'lib')
-rw-r--r--lib/ssl/src/ssl_tls_dist_proxy.erl13
1 files changed, 12 insertions, 1 deletions
diff --git a/lib/ssl/src/ssl_tls_dist_proxy.erl b/lib/ssl/src/ssl_tls_dist_proxy.erl
index 08947f24dd..c392450e03 100644
--- a/lib/ssl/src/ssl_tls_dist_proxy.erl
+++ b/lib/ssl/src/ssl_tls_dist_proxy.erl
@@ -1,7 +1,7 @@
%%
%% %CopyrightBegin%
%%
-%% Copyright Ericsson AB 2011-2016. All Rights Reserved.
+%% Copyright Ericsson AB 2011-2017. All Rights Reserved.
%%
%% Licensed under the Apache License, Version 2.0 (the "License");
%% you may not use this file except in compliance with the License.
@@ -369,6 +369,17 @@ loop_conn(World, Erts) ->
end.
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))];