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

Do not drop default TLS options

Browse Source 
Fixes #1484
This commit is contained in:
Evgeniy Khramtsov 2017-01-26 10:58:26 +03:00
parent c0a89e328a
commit 9d144bd495
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ejabberd_c2s.erl
View File

@ -259,7 +259,7 @@ tls_options(#{lserver := LServer, tls_options := DefaultOpts}) ->
ejabberd_config:get_option( ejabberd_config:get_option(
{domain_certfile, LServer}, {domain_certfile, LServer},
fun iolist_to_binary/1)) of fun iolist_to_binary/1)) of
undefined -> []; undefined -> DefaultOpts;
CertFile -> lists:keystore(certfile, 1, DefaultOpts, CertFile -> lists:keystore(certfile, 1, DefaultOpts,
{certfile, CertFile}) {certfile, CertFile})
end, end,

2
src/ejabberd_s2s.erl
View File

@ -204,7 +204,7 @@ tls_options(LServer, DefaultOpts) ->
ejabberd_config:get_option( ejabberd_config:get_option(
{domain_certfile, LServer}, {domain_certfile, LServer},
fun iolist_to_binary/1)) of fun iolist_to_binary/1)) of
undefined -> []; undefined -> DefaultOpts;
CertFile -> lists:keystore(certfile, 1, DefaultOpts, CertFile -> lists:keystore(certfile, 1, DefaultOpts,
{certfile, CertFile}) {certfile, CertFile})
end, end,