Let 'domain_certfile' take higher precedence

If a 'domain_certfile' is specified, use that instead of the
's2s_certfile' (or 'c2s_certfile').

diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index a0be2e118ef78d90d9f6ad81dcf9d247c297566d..fe60f344ec8a1dbbbf822ea605a0003bf6de23e8 100644 (file)
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -303,9 +303,9 @@ tls_options(#{lserver := LServer, tls_options := DefaultOpts,
                   {true, CertFile} when CertFile /= undefined -> DefaultOpts;
                   {_, _} ->
                       case ejabberd_config:get_option(
-                             {c2s_certfile, LServer},
+                             {domain_certfile, LServer},
                              ejabberd_config:get_option(
-                               {domain_certfile, LServer})) of
+                               {c2s_certfile, LServer})) of
                           undefined -> DefaultOpts;
                           CertFile -> lists:keystore(certfile, 1, DefaultOpts,
                                                      {certfile, CertFile})

diff --git a/src/ejabberd_s2s.erl b/src/ejabberd_s2s.erl
index a614d8c4a62654917b8c3c10c27cf5dbc7a1fc49..cb4e5e5ecfc6e4657f55b8454d408155d68a7596 100644 (file)
--- a/src/ejabberd_s2s.erl
+++ b/src/ejabberd_s2s.erl
@@ -199,9 +199,9 @@ dirty_get_connections() ->
 -spec tls_options(binary(), [proplists:property()]) -> [proplists:property()].
 tls_options(LServer, DefaultOpts) ->
     TLSOpts1 = case ejabberd_config:get_option(
-                     {s2s_certfile, LServer},
+                     {domain_certfile, LServer},
                      ejabberd_config:get_option(
-                       {domain_certfile, LServer})) of
+                       {s2s_certfile, LServer})) of
                   undefined -> DefaultOpts;
                   CertFile -> lists:keystore(certfile, 1, DefaultOpts,
                                              {certfile, CertFile})