diff options
| author | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-07-03 19:23:05 +0300 |
|---|---|---|
| committer | Evgeny Khramtsov <ekhramtsov@process-one.net> | 2019-07-03 19:23:05 +0300 |
| commit | 4658d478b46015b477b039b26877ee53c740c85e (patch) | |
| tree | 9cf6430ba43d7fd81bb48ca3d91490ef047ca22d | |
| parent | Fix jwt_key option processing (diff) | |
Don't call ejabberd_option from ejabberd_options
| -rw-r--r-- | src/ejabberd_options.erl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ejabberd_options.erl b/src/ejabberd_options.erl index 38d834a6b..16d3f7ba5 100644 --- a/src/ejabberd_options.erl +++ b/src/ejabberd_options.erl @@ -54,7 +54,7 @@ opt_type(append_host_config) -> econf:map( econf:and_then( econf:domain(), - econf:enum(ejabberd_option:hosts())), + econf:enum(ejabberd_config:get_option(hosts))), validator(), [unique]); opt_type(auth_cache_life_time) -> @@ -145,7 +145,7 @@ opt_type(host_config) -> econf:map( econf:and_then( econf:domain(), - econf:enum(ejabberd_option:hosts())), + econf:enum(ejabberd_config:get_option(hosts))), validator(), [unique]); opt_type(hosts) -> @@ -516,7 +516,7 @@ options() -> {ldap_password, <<"">>}, {ldap_port, fun(Host) -> - case ejabberd_option:ldap_encrypt(Host) of + case ejabberd_config:get_option({ldap_encrypt, Host}) of tls -> 636; _ -> 389 end |