From: Holger Weiss <holger@zedat.fu-berlin.de>
Date: Sun, 13 Aug 2017 18:31:03 +0000 (+0200)
Subject: Let 'domain_certfile' take higher precedence
X-Git-Tag: 17.09~77^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=64150cc7c5ed60bf6bc422908a1cc39fccde2fe0;p=ejabberd

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 a0be2e118..fe60f344e 100644
--- 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 a614d8c4a..cb4e5e5ec 100644
--- 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})