aboutsummaryrefslogtreecommitdiff
path: root/src/acl.erl
diff options
context:
space:
mode:
authorBadlop <badlop@process-one.net>2016-09-19 11:54:46 +0200
committerBadlop <badlop@process-one.net>2016-09-19 11:56:22 +0200
commitda291d804c140193dfa4144a2147902b141eaf0c (patch)
tree9ba09b9874fa81896b8ba59604b38c6430dab334 /src/acl.erl
parentUpdate riakc to support r19 (diff)
Use mnesia calls instead of ets for Acl and Access tables (#1206)
Diffstat (limited to 'src/acl.erl')
-rw-r--r--src/acl.erl6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/acl.erl b/src/acl.erl
index d3f9afe38..14439ce7a 100644
--- a/src/acl.erl
+++ b/src/acl.erl
@@ -449,9 +449,9 @@ access_matches(all, _Data, _Host) ->
access_matches(none, _Data, _Host) ->
deny;
access_matches(Name, Data, Host) when is_atom(Name) ->
- GAccess = ets:lookup(access, {Name, global}),
+ GAccess = mnesia:dirty_read(access, {Name, global}),
LAccess =
- if Host /= global -> ets:lookup(access, {Name, Host});
+ if Host /= global -> mnesia:dirty_read(access, {Name, Host});
true -> []
end,
case GAccess ++ LAccess of
@@ -484,7 +484,7 @@ access_rules_matches([], _Data, _Host, Default) ->
Default.
get_aclspecs(ACL, Host) ->
- ets:lookup(acl, {ACL, Host}) ++ ets:lookup(acl, {ACL, global}).
+ mnesia:dirty_read(acl, {ACL, Host}) ++ mnesia:dirty_read(acl, {ACL, global}).
is_regexp_match(String, RegExp) ->
case ejabberd_regexp:run(String, RegExp) of