diff options
| author | Holger Weiss <holger@zedat.fu-berlin.de> | 2017-08-14 14:43:03 +0200 |
|---|---|---|
| committer | Holger Weiss <holger@zedat.fu-berlin.de> | 2017-08-14 14:43:03 +0200 |
| commit | e19d1e9571cef87dfca0805481dd7bfa6f2f9161 (patch) | |
| tree | e4aed48f3aae52739ebe687de866d314d60349eb | |
| parent | Temporary remove recent last_item refactor (diff) | |
| parent | Let 'domain_certfile' take higher precedence (diff) | |
Merge remote-tracking branch 'processone/pr/1938'
* processone/pr/1938:
Let 'domain_certfile' take higher precedence
| -rw-r--r-- | src/ejabberd_c2s.erl | 4 | ||||
| -rw-r--r-- | src/ejabberd_s2s.erl | 4 |
2 files changed, 4 insertions, 4 deletions
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}) |