From 9d144bd4953d99001efc55d030b5b4bb20f659d8 Mon Sep 17 00:00:00 2001 From: Evgeniy Khramtsov Date: Thu, 26 Jan 2017 10:58:26 +0300 Subject: [PATCH] Do not drop default TLS options Fixes #1484 --- src/ejabberd_c2s.erl | 2 +- src/ejabberd_s2s.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index e6a7f9c39..28072a5f7 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -259,7 +259,7 @@ tls_options(#{lserver := LServer, tls_options := DefaultOpts}) -> ejabberd_config:get_option( {domain_certfile, LServer}, fun iolist_to_binary/1)) of - undefined -> []; + undefined -> DefaultOpts; CertFile -> lists:keystore(certfile, 1, DefaultOpts, {certfile, CertFile}) end, diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl index 946ac60c8..59ee9216d 100644 --- a/src/ejabberd_s2s.erl +++ b/src/ejabberd_s2s.erl @@ -204,7 +204,7 @@ tls_options(LServer, DefaultOpts) -> ejabberd_config:get_option( {domain_certfile, LServer}, fun iolist_to_binary/1)) of - undefined -> []; + undefined -> DefaultOpts; CertFile -> lists:keystore(certfile, 1, DefaultOpts, {certfile, CertFile}) end,