From cb30f7733df5bbad458fa87f846729b60ef35a11 Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 16 Feb 2017 20:41:57 +0300 Subject: [PATCH 1/2] Use ejabberd_config:get_option/2 instead of ejabberd_config:get_local_option/2 Signed-off-by: Peter Lemenkov --- src/ejabberd_auth_external.erl | 2 +- src/ejabberd_auth_riak.erl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ejabberd_auth_external.erl b/src/ejabberd_auth_external.erl index b1ec7a9bd..333543b0b 100644 --- a/src/ejabberd_auth_external.erl +++ b/src/ejabberd_auth_external.erl @@ -315,7 +315,7 @@ get_mod_last_configured(Server) -> end. is_configured(Host, Module) -> - Os = ejabberd_config:get_local_option({modules, Host}, + Os = ejabberd_config:get_option({modules, Host}, fun(M) when is_list(M) -> M end), lists:keymember(Module, 1, Os). diff --git a/src/ejabberd_auth_riak.erl b/src/ejabberd_auth_riak.erl index 67f2126be..df3321332 100644 --- a/src/ejabberd_auth_riak.erl +++ b/src/ejabberd_auth_riak.erl @@ -270,7 +270,7 @@ remove_user(User, Server, Password) -> is_scrammed() -> scram == - ejabberd_config:get_local_option({auth_password_format, ?MYNAME}, + ejabberd_config:get_option({auth_password_format, ?MYNAME}, fun(V) -> V end). password_to_scram(Password) -> From 009a5007ff5165f2b9a0877285f8ad7ce4125aff Mon Sep 17 00:00:00 2001 From: Peter Lemenkov Date: Thu, 16 Feb 2017 20:47:47 +0300 Subject: [PATCH 2/2] Use ejabberd_config:add_option/2 instead of ejabberd_config:add_local_option/2 Signed-off-by: Peter Lemenkov --- src/ejabberd_commands.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ejabberd_commands.erl b/src/ejabberd_commands.erl index 9491288f9..9bfa94dd6 100644 --- a/src/ejabberd_commands.erl +++ b/src/ejabberd_commands.erl @@ -332,7 +332,7 @@ expose_commands(Commands) -> end, Commands), - case ejabberd_config:add_local_option(commands, [{add_commands, Names}]) of + case ejabberd_config:add_option(commands, [{add_commands, Names}]) of {aborted, Reason} -> {error, Reason}; {atomic, Result} ->