Chapril/xmpp.chapril.org-ejabberd
24
1
Fork 0
mirror of https://github.com/processone/ejabberd.git synced 2024-06-12 21:52:07 +02:00
Code Releases Activity

Don't call ejabberd_option from ejabberd_options

Browse Source
This commit is contained in:
Evgeny Khramtsov 2019-07-03 19:23:05 +03:00
parent b7f6620166
commit 4658d478b4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ejabberd_options.erl
View File

@ -54,7 +54,7 @@ opt_type(append_host_config) ->
econf:map( econf:map(
econf:and_then( econf:and_then(
econf:domain(), econf:domain(),
econf:enum(ejabberd_option:hosts())), econf:enum(ejabberd_config:get_option(hosts))),
validator(), validator(),
[unique]); [unique]);
opt_type(auth_cache_life_time) -> opt_type(auth_cache_life_time) ->
@ -145,7 +145,7 @@ opt_type(host_config) ->
econf:map( econf:map(
econf:and_then( econf:and_then(
econf:domain(), econf:domain(),
econf:enum(ejabberd_option:hosts())), econf:enum(ejabberd_config:get_option(hosts))),
validator(), validator(),
[unique]); [unique]);
opt_type(hosts) -> opt_type(hosts) ->
@ -516,7 +516,7 @@ options() ->
{ldap_password, <<"">>}, {ldap_password, <<"">>},
{ldap_port, {ldap_port,
fun(Host) -> fun(Host) ->
case ejabberd_option:ldap_encrypt(Host) of case ejabberd_config:get_option({ldap_encrypt, Host}) of
tls -> 636; tls -> 636;
_ -> 389 _ -> 389
end end