diff options
Diffstat (limited to 'src/ejabberd_s2s_in.erl')
| -rw-r--r-- | src/ejabberd_s2s_in.erl | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl index 7692614ea..2ad335657 100644 --- a/src/ejabberd_s2s_in.erl +++ b/src/ejabberd_s2s_in.erl @@ -149,7 +149,7 @@ init([{SockMod, Socket}, Opts]) -> _ -> none end, {StartTLS, TLSRequired, TLSCertverify} = - case ejabberd_config:get_local_option( + case ejabberd_config:get_option( s2s_use_starttls, fun(false) -> false; (true) -> true; @@ -171,7 +171,7 @@ init([{SockMod, Socket}, Opts]) -> required_trusted -> {true, true, true} end, - TLSOpts1 = case ejabberd_config:get_local_option( + TLSOpts1 = case ejabberd_config:get_option( s2s_certfile, fun iolist_to_binary/1) of undefined -> []; @@ -324,7 +324,7 @@ wait_for_feature_request({xmlstreamelement, El}, ?DEBUG("starttls", []), Socket = StateData#state.socket, TLSOpts1 = case - ejabberd_config:get_local_option( + ejabberd_config:get_option( {domain_certfile, StateData#state.server}, fun iolist_to_binary/1) of undefined -> StateData#state.tls_options; @@ -332,7 +332,7 @@ wait_for_feature_request({xmlstreamelement, El}, [{certfile, CertFile} | lists:keydelete(certfile, 1, StateData#state.tls_options)] end, - TLSOpts = case ejabberd_config:get_local_option( + TLSOpts = case ejabberd_config:get_option( {s2s_tls_compression, StateData#state.server}, fun(true) -> true; (false) -> false @@ -843,7 +843,7 @@ fsm_limit_opts(Opts) -> case lists:keysearch(max_fsm_queue, 1, Opts) of {value, {_, N}} when is_integer(N) -> [{max_queue, N}]; _ -> - case ejabberd_config:get_local_option( + case ejabberd_config:get_option( max_fsm_queue, fun(I) when is_integer(I), I > 0 -> I end) of undefined -> []; |