Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-12-22 17:28:25 +01:00
Code Releases Activity

Merge remote-tracking branch 'processone/pr/1938'

Browse Source 
* processone/pr/1938:
  Let 'domain_certfile' take higher precedence
This commit is contained in:
Holger Weiss 2017-08-14 14:43:03 +02:00
commit e19d1e9571
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ejabberd_c2s.erl
View File

@ -303,9 +303,9 @@ tls_options(#{lserver := LServer, tls_options := DefaultOpts,
{true, CertFile} when CertFile /= undefined -> DefaultOpts; {true, CertFile} when CertFile /= undefined -> DefaultOpts;
{_, _} -> {_, _} ->
case ejabberd_config:get_option( case ejabberd_config:get_option(
{c2s_certfile, LServer}, {domain_certfile, LServer},
ejabberd_config:get_option( ejabberd_config:get_option(
{domain_certfile, LServer})) of {c2s_certfile, LServer})) of
undefined -> DefaultOpts; undefined -> DefaultOpts;
CertFile -> lists:keystore(certfile, 1, DefaultOpts, CertFile -> lists:keystore(certfile, 1, DefaultOpts,
{certfile, CertFile}) {certfile, CertFile})

4
src/ejabberd_s2s.erl
View File

@ -199,9 +199,9 @@ dirty_get_connections() ->
-spec tls_options(binary(), [proplists:property()]) -> [proplists:property()]. -spec tls_options(binary(), [proplists:property()]) -> [proplists:property()].
tls_options(LServer, DefaultOpts) -> tls_options(LServer, DefaultOpts) ->
TLSOpts1 = case ejabberd_config:get_option( TLSOpts1 = case ejabberd_config:get_option(
{s2s_certfile, LServer}, {domain_certfile, LServer},
ejabberd_config:get_option( ejabberd_config:get_option(
{domain_certfile, LServer})) of {s2s_certfile, LServer})) of
undefined -> DefaultOpts; undefined -> DefaultOpts;
CertFile -> lists:keystore(certfile, 1, DefaultOpts, CertFile -> lists:keystore(certfile, 1, DefaultOpts,
{certfile, CertFile}) {certfile, CertFile})