Chapril/xmpp.chapril.org-ejabberd
25
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-11-22 16:20:52 +01:00
Code Releases Activity

Log warnings for c2s/s2s certfile option

Browse Source
This commit is contained in:
Evgeniy Khramtsov 2017-11-03 08:32:34 +03:00
parent 79a9a0ed29
commit c72e0a6ca6
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ejabberd_c2s.erl
View File

@ -998,8 +998,10 @@ opt_type(_) ->
(atom()) -> [atom()]. (atom()) -> [atom()].
listen_opt_type(access) -> fun acl:access_rules_validator/1; listen_opt_type(access) -> fun acl:access_rules_validator/1;
listen_opt_type(shaper) -> fun acl:shaper_rules_validator/1; listen_opt_type(shaper) -> fun acl:shaper_rules_validator/1;
listen_opt_type(certfile) -> listen_opt_type(certfile = Opt) ->
fun(S) -> fun(S) ->
?WARNING_MSG("Listening option '~s' for ~s is deprecated, use "
"'certfiles' global option instead", [Opt, ?MODULE]),
ejabberd_pkix:add_certfile(S), ejabberd_pkix:add_certfile(S),
iolist_to_binary(S) iolist_to_binary(S)
end; end;

4
src/ejabberd_s2s_in.erl
View File

@ -359,8 +359,10 @@ change_shaper(#{shaper := ShaperName, server_host := ServerHost} = State,
(max_fsm_queue) -> fun((pos_integer()) -> pos_integer()); (max_fsm_queue) -> fun((pos_integer()) -> pos_integer());
(atom()) -> [atom()]. (atom()) -> [atom()].
listen_opt_type(shaper) -> fun acl:shaper_rules_validator/1; listen_opt_type(shaper) -> fun acl:shaper_rules_validator/1;
listen_opt_type(certfile) -> listen_opt_type(certfile = Opt) ->
fun(S) -> fun(S) ->
?WARNING_MSG("Listening option '~s' for ~s is deprecated, use "
"'certfiles' global option instead", [Opt, ?MODULE]),
ejabberd_pkix:add_certfile(S), ejabberd_pkix:add_certfile(S),
iolist_to_binary(S) iolist_to_binary(S)
end; end;