summaryrefslogtreecommitdiff
path: root/src/ejabberd_xmlrpc.erl
diff options
context:
space:
mode:
authorAlexey Shchepin <alexey@process-one.net>2015-10-20 17:19:31 +0300
committerAlexey Shchepin <alexey@process-one.net>2015-10-20 17:20:13 +0300
commit8a2fa62cac178a5e15ce7aae3db1af994a4e813a (patch)
tree23a63b1934d16c100db5a1c9dee2134b8006c0c1 /src/ejabberd_xmlrpc.erl
parentPass {C,CPP,LD}FLAGS used in main ./configure call to invocations from deps (diff)
Remove access_commands 'unrestricted' option, use [] instead. Fix unauthenticated calls to commands with policy=user.
Diffstat (limited to 'src/ejabberd_xmlrpc.erl')
-rw-r--r--src/ejabberd_xmlrpc.erl7
1 files changed, 1 insertions, 6 deletions
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}) ->