Improve handling on acl rules in api_permissions

diff --git a/src/ejabberd_access_permissions.erl b/src/ejabberd_access_permissions.erl
index 1939bcfa081247421c052bd0ef88a463aa154330..7aca2a8ef4caeebbc7df6a841f6be6606361cff9 100644 (file)
--- a/src/ejabberd_access_permissions.erl
+++ b/src/ejabberd_access_permissions.erl
@@ -266,7 +266,7 @@ matches_definition({_Name, {From, Who, What}}, Cmd, Module, Host, CallerInfo) ->
                    lists:any(
                        fun({access, Access}) when Scope == none ->
                            acl:access_matches(Access, CallerInfo, Host) == allow;
-                          ({acl, _} = Acl) when Scope == none ->
+                          ({acl, Acl}) when Scope == none ->
                               acl:acl_rule_matches(Acl, CallerInfo, Host);
                           ({oauth, Scopes, List}) when Scope /= none ->
                               case ejabberd_oauth:scope_in_scope_list(Scope, Scopes) of
@@ -274,7 +274,7 @@ matches_definition({_Name, {From, Who, What}}, Cmd, Module, Host, CallerInfo) ->
                                       lists:any(
                                           fun({access, Access}) ->
                                               acl:access_matches(Access, CallerInfo, Host) == allow;
-                                             ({acl, _} = Acl) ->
+                                             ({acl, Acl} = Acl) ->
                                                  acl:acl_rule_matches(Acl, CallerInfo, Host)
                                           end, List);
                                   _ ->
@@ -407,7 +407,7 @@ parse_who(Name, Defs, ParseOauth) when is_list(Defs) ->
                       {scope, ScopeList2}
               end;
           (Atom) when is_atom(Atom) ->
-              {acl, Atom};
+              {acl, {acl, Atom}};
           ([Other]) ->
               try acl:normalize_spec(Other) of
                   Rule2 ->