From 8a2fa62cac178a5e15ce7aae3db1af994a4e813a Mon Sep 17 00:00:00 2001 From: Alexey Shchepin Date: Tue, 20 Oct 2015 17:19:31 +0300 Subject: Remove access_commands 'unrestricted' option, use [] instead. Fix unauthenticated calls to commands with policy=user. --- src/ejabberd_xmlrpc.erl | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'src/ejabberd_xmlrpc.erl') diff --git a/src/ejabberd_xmlrpc.erl b/src/ejabberd_xmlrpc.erl index 59a20d92..db109920 100644 --- a/src/ejabberd_xmlrpc.erl +++ b/src/ejabberd_xmlrpc.erl @@ -197,14 +197,11 @@ socket_type() -> raw. %% ----------------------------- process(_, #request{method = 'POST', data = Data, opts = Opts}) -> AccessCommandsOpts = gen_mod:get_opt(access_commands, Opts, - fun(L) when is_list(L) -> L; - (unrestricted) -> unrestricted - end, + fun(L) when is_list(L) -> L end, undefined), AccessCommands = case AccessCommandsOpts of undefined -> undefined; - unrestricted -> unrestricted; _ -> lists:flatmap( fun({Ac, AcOpts}) -> @@ -540,8 +537,6 @@ make_status(false) -> 1; make_status(error) -> 1; make_status(_) -> 1. -transform_listen_option({access_commands, unrestricted} = Opt, Opts) -> - [Opt | Opts]; transform_listen_option({access_commands, ACOpts}, Opts) -> NewACOpts = lists:map( fun({AName, ACmds, AOpts}) -> -- cgit v1.2.3