diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2018-09-27 20:37:27 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2018-09-27 20:37:27 +0300 |
| commit | 39fa1a810d6a663be452ee44427e2c066095c3c9 (patch) | |
| tree | 83e14459fcbcf2337d2f717f687a1e294148e479 /src/ejabberd_c2s.erl | |
| parent | mod_avatar: Reduce log level for too large avatars (diff) | |
Move certificates processing code to pkix application
==== WARNING: MUST BE ADDED TO RELEASE NOTES =====
The commit introduces the following incompatibility:
- Option 'ca_path' is deprecated and has no effect anymore:
option 'ca_file' should be used instead if needed.
==================================================
Diffstat (limited to '')
| -rw-r--r-- | src/ejabberd_c2s.erl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl index cdf4f9d6f..0915d21d3 100644 --- a/src/ejabberd_c2s.erl +++ b/src/ejabberd_c2s.erl @@ -982,8 +982,8 @@ listen_opt_type(certfile = Opt) -> fun(S) -> ?WARNING_MSG("Listening option '~s' for ~s is deprecated, use " "'certfiles' global option instead", [Opt, ?MODULE]), - ok = ejabberd_pkix:add_certfile(S), - iolist_to_binary(S) + {ok, File} = ejabberd_pkix:add_certfile(S), + File end; listen_opt_type(starttls) -> fun(B) when is_boolean(B) -> B end; listen_opt_type(starttls_required) -> fun(B) when is_boolean(B) -> B end; |