mirror of
https://github.com/processone/ejabberd.git
synced 2024-06-10 21:47:01 +02:00
Merge pull request #302 from weiss/ldap-deref-aliases
Rename deref_aliases back to ldap_deref_aliases
This commit is contained in:
commit
e49cf604e9
|
@ -228,13 +228,28 @@ get_config(Host, Opts) ->
|
||||||
Base = get_opt({ldap_base, Host}, Opts,
|
Base = get_opt({ldap_base, Host}, Opts,
|
||||||
fun iolist_to_binary/1,
|
fun iolist_to_binary/1,
|
||||||
<<"">>),
|
<<"">>),
|
||||||
DerefAliases = get_opt({deref_aliases, Host}, Opts,
|
OldDerefAliases = get_opt({deref_aliases, Host}, Opts,
|
||||||
fun(never) -> never;
|
fun(never) -> never;
|
||||||
(searching) -> searching;
|
(searching) -> searching;
|
||||||
(finding) -> finding;
|
(finding) -> finding;
|
||||||
(always) -> always
|
(always) -> always
|
||||||
end, never),
|
end, unspecified),
|
||||||
#eldap_config{servers = Servers,
|
DerefAliases =
|
||||||
|
if OldDerefAliases == unspecified ->
|
||||||
|
get_opt({ldap_deref_aliases, Host}, Opts,
|
||||||
|
fun(never) -> never;
|
||||||
|
(searching) -> searching;
|
||||||
|
(finding) -> finding;
|
||||||
|
(always) -> always
|
||||||
|
end, never);
|
||||||
|
true ->
|
||||||
|
?WARNING_MSG("Option 'deref_aliases' is deprecated. "
|
||||||
|
"The option is still supported "
|
||||||
|
"but it is better to fix your config: "
|
||||||
|
"use 'ldap_deref_aliases' instead.", []),
|
||||||
|
OldDerefAliases
|
||||||
|
end,
|
||||||
|
#eldap_config{servers = Servers,
|
||||||
backups = Backups,
|
backups = Backups,
|
||||||
tls_options = [{encrypt, Encrypt},
|
tls_options = [{encrypt, Encrypt},
|
||||||
{tls_verify, TLSVerify},
|
{tls_verify, TLSVerify},
|
||||||
|
|
Loading…
Reference in New Issue
Block a user