aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaweł Chmielowski <pchmielowski@process-one.net>2016-12-08 12:01:24 +0100
committerPaweł Chmielowski <pchmielowski@process-one.net>2016-12-08 12:01:24 +0100
commita3b12fd7453ac4a332864d0c7016d0c12e90ac82 (patch)
treede1f9a13ae1af09a1e6feb04e835512e3d93bbc6
parentCleanup ext_mod and fix compilation path (diff)
Recognize "- who:" not only "who:" syntax in api_permissions
-rw-r--r--src/ejabberd_access_permissions.erl3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/ejabberd_access_permissions.erl b/src/ejabberd_access_permissions.erl
index 60ad68a29..1939bcfa0 100644
--- a/src/ejabberd_access_permissions.erl
+++ b/src/ejabberd_access_permissions.erl
@@ -331,7 +331,8 @@ command_matches_patterns(C, [_ | Tail]) ->
parse_api_permissions(Data) when is_list(Data) ->
throw({replace_with, [parse_api_permission(Name, Args) || {Name, Args} <- Data]}).
-parse_api_permission(Name, Args) ->
+parse_api_permission(Name, Args0) ->
+ Args = lists:flatten(Args0),
{From, Who, What} = case key_split(Args, [{from, []}, {who, none}, {what, []}]) of
{error, Msg} ->
report_error(<<"~s inside api_permission '~s' section">>, [Msg, Name]);